rhodes 2.2.6 → 2.3.0.beta.1

data/installer/instant-rhodes.nsi

@@ -0,0 +1,427 @@
+;======================================================
+; Include
+ 
+  !include "MUI.nsh"
+  !include "LogicLib.nsh"
+  !include "EnvVarUpdate.nsh"
+ 
+;======================================================
+; Installer Information
+ 
+  Name "Instant Rhodes"
+  OutFile "instant_rhodes.exe"
+  InstallDir C:\InstantRhodes
+  BrandingText " "
+;======================================================
+; Modern Interface Configuration
+ 
+  !define MUI_ICON "icon.ico" 
+  !define MUI_UNICON "icon.ico"     
+  !define MUI_HEADERIMAGE
+  !define MUI_ABORTWARNING
+  !define MUI_COMPONENTSPAGE_SMALLDESC
+  !define MUI_HEADERIMAGE_BITMAP_NOSTRETCH
+  !define MUI_FINISHPAGE_SHOWREADME $INSTDIR\README.html
+  !define MUI_FINISHPAGE
+  !define MUI_FINISHPAGE_TEXT "Thank you for installing Rhodes and RhoSync. \r\n\n\n"
+ 
+ 
+;======================================================
+; Pages
+ 
+  !insertmacro MUI_PAGE_WELCOME
+  !define MUI_PAGE_HEADER_TEXT "RhoSync License Agreement"
+  !define MUI_PAGE_HEADER_SUBTEXT "Please review the RhoSync license terms before installing Instant Rhodes."
+  !insertmacro MUI_PAGE_LICENSE "RHOSYNC-LICENSE.txt"
+  !insertmacro MUI_PAGE_COMPONENTS
+  !insertmacro MUI_PAGE_DIRECTORY
+  !insertmacro MUI_PAGE_INSTFILES
+  !insertmacro MUI_PAGE_FINISH
+ 
+;======================================================
+; Languages
+ 
+  !insertmacro MUI_LANGUAGE "English"
+ 
+;======================================================
+; Reserve Files
+ 
+  ;ReserveFile "configUi.ini"
+  ;!insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
+ 
+;======================================================
+; Sections
+
+# start default section
+section
+ 
+    # set the installation directory as the destination for the following actions
+    setOutPath $INSTDIR
+ 
+    # create the uninstaller
+    writeUninstaller "$INSTDIR\uninstall.exe"
+ 
+    # create a shortcut named "new shortcut" in the start menu programs directory
+    # point the new shortcut at the program uninstaller
+    createShortCut "$SMPROGRAMS\Uninstall Instant Rhodes.lnk" "$INSTDIR\uninstall.exe"
+sectionEnd
+ 
+# uninstaller section start
+section "uninstall"
+ 
+    # first, delete the uninstaller
+    delete "$INSTDIR\uninstall.exe"
+ 
+    # second, remove the link from the start menu
+    delete "$SMPROGRAMS\Uninstall Instant Rhodes.lnk"
+
+    # remove env vars
+    Push "PATH" 
+    Push "R" 
+    Push "HKLM" 
+    Push "$INSTDIR\ruby\bin"
+    Call un.EnvVarUpdate
+    Pop $R0
+
+    Push "PATH" 
+    Push "R" 
+    Push "HKLM" 
+    Push "$INSTDIR\make-3.81\bin"
+    Call un.EnvVarUpdate
+    Pop $R0
+
+    Push "PATH" 
+    Push "R" 
+    Push "HKLM" 
+    Push "$INSTDIR\redis-1.2.6-windows"
+    Call un.EnvVarUpdate
+    Pop $R0
+
+    Push "REDIS_HOME" 
+    Push "R" 
+    Push "HKLM" 
+    Push "$INSTDIR\redis-1.2.6-windows"
+    Call un.EnvVarUpdate
+    Pop $R0
+
+    # remove $INSTDIR
+    RMDir /r /REBOOTOK $INSTDIR
+ 
+
+# uninstaller section end
+sectionEnd
+
+Section "Ruby, Rubygems, Rhodes, and RhoSync" rubySection
+ 
+  SetOutPath $INSTDIR
+ 
+  File /r "ruby"
+  File /r "make-3.81"
+  File "README.html"
+  File "RHOSYNC-LICENSE.txt"
+ 
+  ;add to path here
+
+  Push "PATH" 
+  Push "P" 
+  Push "HKLM" 
+  Push "$INSTDIR\ruby\bin"
+  Call EnvVarUpdate
+  Pop $R0
+
+  Push "$INSTDIR\binfileoutput.txt" # output file - unused paramter
+  Push "*." # filter
+  Push "$INSTDIR\ruby\bin" # folder to search in
+  Call FixScriptFilesInDir
+  Pop $R0
+
+  Push "$INSTDIR\binfileoutput1.txt" # output file - unused paramter
+  Push "*.bat" # filter
+  Push "$INSTDIR\ruby\bin" # folder to search in
+  Call FixScriptFilesInDir
+  Pop $R0
+
+  Push "$INSTDIR\binfileoutput2.txt" # output file - unused paramter
+  Push "*.rb" # filter
+  Push "$INSTDIR\ruby\bin" # folder to search in
+  Call FixScriptFilesInDir
+  Pop $R0
+
+  delete "$INSTDIR\binfileoutput.txt"
+  delete "$INSTDIR\binfileoutput1.txt"
+  delete "$INSTDIR\binfileoutput2.txt"
+
+SectionEnd
+
+Section "Redis" redisSection
+ 
+  SetOutPath $INSTDIR
+ 
+  File /r "redis-1.2.6-windows"
+ 
+  ;add to path here
+
+  Push "PATH" 
+  Push "P" 
+  Push "HKLM" 
+  Push "$INSTDIR\redis-1.2.6-windows"
+  Call EnvVarUpdate
+  Pop $R0
+
+  Push "REDIS_HOME" 
+  Push "P" 
+  Push "HKLM" 
+  Push "$INSTDIR\redis-1.2.6-windows"
+  Call EnvVarUpdate
+  Pop $R0
+
+SectionEnd
+
+Section "Git 1.7.3.1" gitSection
+
+  SetOutPath $INSTDIR
+  
+  File "Git-1.7.3.1-preview20101002.exe"
+ 
+  ExecWait "$INSTDIR\Git-1.7.3.1-preview20101002.exe"
+
+  delete "$INSTDIR\Git-1.7.3.1-preview20101002.exe"
+
+SectionEnd
+
+
+Section "GNU Make" gnumakeSection
+
+  SetOutPath $INSTDIR
+ 
+  File /r "make-3.81"
+
+  Push "PATH" 
+  Push "P" 
+  Push "HKLM" 
+  Push "$INSTDIR\make-3.81\bin"
+  Call EnvVarUpdate
+  Pop $R0
+
+SectionEnd
+
+
+;======================================================
+;Descriptions
+ 
+  ;Language strings
+  LangString DESC_InstallRuby ${LANG_ENGLISH} "This installs ruby 1.8.7, rubygems 1.3.7, Rhodes and RhoSync gems."
+  LangString DESC_InstallRedis ${LANG_ENGLISH} "This installs redis 1.2.6 (required to run RhoSync)."
+  LangString DESC_InstallGit ${LANG_ENGLISH} "This installs Git (which includes the Git Bash)."
+  LangString DESC_InstallGnuMake ${LANG_ENGLISH} "This installs GNU Make (sometimes required to update gems)."
+  
+  ;Assign language strings to sections
+  !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
+  !insertmacro MUI_DESCRIPTION_TEXT ${rubySection} $(DESC_InstallRuby) 
+  !insertmacro MUI_DESCRIPTION_TEXT ${redisSection} $(DESC_InstallRedis)
+  !insertmacro MUI_DESCRIPTION_TEXT ${gitSection} $(DESC_InstallGit)
+  !insertmacro MUI_DESCRIPTION_TEXT ${gnumakeSection} $(DESC_InstallGnuMake)  
+  !insertmacro MUI_FUNCTION_DESCRIPTION_END
+
+;======================================================
+;Functions
+
+Function FixScriptFilesInDir
+Exch $R0 #path
+Exch
+Exch $R1 #filter
+Exch
+Exch 2
+Exch $R2 #output file
+Exch 2
+Push $R3
+Push $R4
+Push $R5
+Push $R6
+ ClearErrors
+ FindFirst $R3 $R4 "$R0\$R1"
+  FileOpen $R5 $R2 w
+
+ Push $INSTDIR
+ Push "\"
+ Call StrSlash
+ Pop $R6 
+
+ Loop:
+ IfErrors Done
+  StrCmp $R4 "." gotoNextFile
+  StrCmp $R4 ".." gotoNextFile
+
+  ;replace package folder with INSTDIR
+  Push C:/dev/rhodesinstaller
+  Push $R6
+  Push all
+  Push all
+  Push "$R0\$R4"
+  Call AdvReplaceInFile
+  FileWrite $R5 "$R0\$R4$\r$\n"
+  FindNext $R3 $R4
+  Goto Loop
+
+ gotoNextFile:
+  FindNext $R3 $R4
+  Goto Loop
+
+ Done:
+  FileClose $R5
+ FindClose $R3
+Pop $R6
+Pop $R5
+Pop $R4
+Pop $R3
+Pop $R2
+Pop $R1
+Pop $R0
+FunctionEnd
+
+
+
+Function AdvReplaceInFile
+Exch $0 ;file to replace in
+Exch
+Exch $1 ;number to replace after
+Exch
+Exch 2
+Exch $2 ;replace and onwards
+Exch 2
+Exch 3
+Exch $3 ;replace with
+Exch 3
+Exch 4
+Exch $4 ;to replace
+Exch 4
+Push $5 ;minus count
+Push $6 ;universal
+Push $7 ;end string
+Push $8 ;left string
+Push $9 ;right string
+Push $R0 ;file1
+Push $R1 ;file2
+Push $R2 ;read
+Push $R3 ;universal
+Push $R4 ;count (onwards)
+Push $R5 ;count (after)
+Push $R6 ;temp file name
+ 
+  GetTempFileName $R6
+  FileOpen $R1 $0 r ;file to search in
+  FileOpen $R0 $R6 w ;temp file
+   StrLen $R3 $4
+   StrCpy $R4 -1
+   StrCpy $R5 -1
+ 
+loop_read:
+ ClearErrors
+ FileRead $R1 $R2 ;read line
+ IfErrors exit
+ 
+   StrCpy $5 0
+   StrCpy $7 $R2
+ 
+loop_filter:
+   IntOp $5 $5 - 1
+   StrCpy $6 $7 $R3 $5 ;search
+   StrCmp $6 "" file_write2
+   StrCmp $6 $4 0 loop_filter
+ 
+StrCpy $8 $7 $5 ;left part
+IntOp $6 $5 + $R3
+IntCmp $6 0 is0 not0
+is0:
+StrCpy $9 ""
+Goto done
+not0:
+StrCpy $9 $7 "" $6 ;right part
+done:
+StrCpy $7 $8$3$9 ;re-join
+ 
+IntOp $R4 $R4 + 1
+StrCmp $2 all file_write1
+StrCmp $R4 $2 0 file_write2
+IntOp $R4 $R4 - 1
+ 
+IntOp $R5 $R5 + 1
+StrCmp $1 all file_write1
+StrCmp $R5 $1 0 file_write1
+IntOp $R5 $R5 - 1
+Goto file_write2
+ 
+file_write1:
+ FileWrite $R0 $7 ;write modified line
+Goto loop_read
+ 
+file_write2:
+ FileWrite $R0 $R2 ;write unmodified line
+Goto loop_read
+ 
+exit:
+  FileClose $R0
+  FileClose $R1
+ 
+   SetDetailsPrint none
+  Delete $0
+  Rename $R6 $0
+  Delete $R6
+   SetDetailsPrint both
+ 
+Pop $R6
+Pop $R5
+Pop $R4
+Pop $R3
+Pop $R2
+Pop $R1
+Pop $R0
+Pop $9   
+Pop $8
+Pop $7
+Pop $6
+Pop $5
+Pop $0
+Pop $1
+Pop $2
+Pop $3
+Pop $4
+FunctionEnd 
+
+
+; Push $filenamestring (e.g. 'c:\this\and\that\filename.htm')
+; Push "\"
+; Call StrSlash
+; Pop $R0
+; ;Now $R0 contains 'c:/this/and/that/filename.htm'
+Function StrSlash
+  Exch $R3 ; $R3 = needle ("\" or "/")
+  Exch
+  Exch $R1 ; $R1 = String to replacement in (haystack)
+  Push $R2 ; Replaced haystack
+  Push $R4 ; $R4 = not $R3 ("/" or "\")
+  Push $R6
+  Push $R7 ; Scratch reg
+  StrCpy $R2 ""
+  StrLen $R6 $R1
+  StrCpy $R4 "\"
+  StrCmp $R3 "/" loop
+  StrCpy $R4 "/"  
+loop:
+  StrCpy $R7 $R1 1
+  StrCpy $R1 $R1 $R6 1
+  StrCmp $R7 $R3 found
+  StrCpy $R2 "$R2$R7"
+  StrCmp $R1 "" done loop
+found:
+  StrCpy $R2 "$R2$R4"
+  StrCmp $R1 "" done loop
+done:
+  StrCpy $R3 $R2
+  Pop $R7
+  Pop $R6
+  Pop $R4
+  Pop $R2
+  Pop $R1
+  Exch $R3
+FunctionEnd

data/lib/build/jake.rb

@@ -179,7 +179,7 @@ class Jake
         $getdump = true
       end
       
-      return ($failed == 0)
+      return true
   end
   
   def self.process_spec_results(start)
@@ -428,5 +428,19 @@ class Jake
     #puts args.to_s
     puts run("ant.bat",args,dir)
   end
+  
+  def self.modify_file_if_content_changed(file_name, f)
+    f.rewind
+    content = f.read()
+    old_content = File.exists?(file_name) ? File.read(file_name) : ""
+
+    if old_content != content  
+        puts "Modify #{file_name}"      
+        File.open(file_name, "w"){|file| file.write(content)}
+    end
+    
+    f.close
+  end
+  
 end
   

data/lib/extensions/barcode/ext/barcode/platform/android/jni/src/imageprovider.cpp

@@ -35,7 +35,7 @@ RHO_GLOBAL void rho_platform_image_load_grayscale(const char* url, void** image_
 		return;
 	}
 
-	jstring jstrFileUrl = rho_cast<jstring>(url);
+	jstring jstrFileUrl = env->NewStringUTF(url);//rho_cast<jstring>(url);
 	if (!jstrFileUrl) {
 		RAWLOG_ERROR("rho_platform_image_load_grayscale() : invalid URL !");
 		return;

data/lib/extensions/barcode/ext/barcode/platform/bb/Barcode6.files

@@ -0,0 +1,45 @@
+Rhode\com\rho\rubyext\BarcodeRecognizer.java
+ZXing\core\src\com\google\zxing\client\result\AbstractDoCoMoResultParser.java
+ZXing\core\src\com\google\zxing\client\result\AddressBookAUResultParser.java
+ZXing\core\src\com\google\zxing\client\result\AddressBookDoCoMoResultParser.java
+ZXing\core\src\com\google\zxing\client\result\AddressBookParsedResult.java
+ZXing\core\src\com\google\zxing\client\result\BizcardResultParser.java
+ZXing\core\src\com\google\zxing\client\result\BookmarkDoCoMoResultParser.java
+ZXing\core\src\com\google\zxing\client\result\CalendarParsedResult.java
+ZXing\core\src\com\google\zxing\client\result\EmailAddressParsedResult.java
+ZXing\core\src\com\google\zxing\client\result\EmailAddressResultParser.java
+ZXing\core\src\com\google\zxing\client\result\EmailDoCoMoResultParser.java
+ZXing\core\src\com\google\zxing\client\result\GeoParsedResult.java
+ZXing\core\src\com\google\zxing\client\result\GeoResultParser.java
+ZXing\core\src\com\google\zxing\client\result\ISBNParsedResult.java
+ZXing\core\src\com\google\zxing\client\result\ISBNResultParser.java
+ZXing\core\src\com\google\zxing\client\result\optional\AbstractNDEFResultParser.java
+ZXing\core\src\com\google\zxing\client\result\optional\NDEFRecord.java
+ZXing\core\src\com\google\zxing\client\result\optional\NDEFSmartPosterParsedResult.java
+ZXing\core\src\com\google\zxing\client\result\optional\NDEFSmartPosterResultParser.java
+ZXing\core\src\com\google\zxing\client\result\optional\NDEFTextResultParser.java
+ZXing\core\src\com\google\zxing\client\result\optional\NDEFURIResultParser.java
+ZXing\core\src\com\google\zxing\client\result\ParsedResult.java
+ZXing\core\src\com\google\zxing\client\result\ParsedResultType.java
+ZXing\core\src\com\google\zxing\client\result\ProductParsedResult.java
+ZXing\core\src\com\google\zxing\client\result\ProductResultParser.java
+ZXing\core\src\com\google\zxing\client\result\ResultParser.java
+ZXing\core\src\com\google\zxing\client\result\SMSMMSResultParser.java
+ZXing\core\src\com\google\zxing\client\result\SMSParsedResult.java
+ZXing\core\src\com\google\zxing\client\result\TelParsedResult.java
+ZXing\core\src\com\google\zxing\client\result\TelResultParser.java
+ZXing\core\src\com\google\zxing\client\result\TextParsedResult.java
+ZXing\core\src\com\google\zxing\client\result\URIParsedResult.java
+ZXing\core\src\com\google\zxing\client\result\URIResultParser.java
+ZXing\core\src\com\google\zxing\client\result\URLTOResultParser.java
+ZXing\core\src\com\google\zxing\client\result\VCardResultParser.java
+ZXing\core\src\com\google\zxing\client\result\VEventResultParser.java
+ZXing\javame\src\com\google\zxing\client\j2me\AdvancedMultimediaManager.java
+ZXing\javame\src\com\google\zxing\client\j2me\DefaultMultimediaManager.java
+ZXing\javame\src\com\google\zxing\client\j2me\LCDUIImageLuminanceSource.java
+ZXing\javame\src\com\google\zxing\client\j2me\Menu.java
+ZXing\javame\src\com\google\zxing\client\j2me\MultimediaManager.java
+ZXing\javame\src\com\google\zxing\client\j2me\SnapshotThread.java
+ZXing\javame\src\com\google\zxing\client\j2me\SplashThread.java
+ZXing\javame\src\com\google\zxing\client\j2me\VideoCanvas.java
+ZXing\javame\src\com\google\zxing\client\j2me\ZXingMIDlet.java

data/lib/extensions/barcode/ext/barcode/platform/bb/Rakefile

@@ -8,7 +8,10 @@ USE_STLPORT = true
 def build_extension
 
 	#vsrclist = #rhoroot + "/lib/extensions/barcode/ext/barcode/platform/bb/barcode.files"
+        
 	vsrclist = "Barcode.files"
+        vsrclist = "Barcode6.files" if ($bbver == '6.0')
+
         args = []
         args << "-g"
         args << "-d"
@@ -80,6 +83,9 @@ namespace "build" do
     $rhoroot = ENV['RHO_ROOT']
     raise "RHO_ROOT is not set" if $rhoroot.nil?
 
+    $bbver = ENV['BB_SDK_VERSION']
+    raise "BB_SDK_VERSION is not set" if $bbver.nil?
+
   end
 
   task :all => :config do

data/lib/extensions/barcode/ext/barcode/platform/bb/barcode6.jdp

@@ -0,0 +1,92 @@
+## RIM Java Development Environment
+# RIM Project file
+#
+# This file is generated and managed by BlackBerry developer tools.
+# It SHOULD NOT BE modified manually.
+#
+AddOn=0
+AlwaysBuild=0
+[AlxImports
+]
+AutoRestart=0
+[ClassProtection
+]
+[CustomBuildFiles
+]
+[CustomBuildRules
+]
+[DefFiles
+]
+[DependsOn
+]
+ExcludeFromBuildAll=0
+[Files
+BarcodeRecognizer.java
+ZXing\core\src\com\google\zxing\client\result\AbstractDoCoMoResultParser.java
+ZXing\core\src\com\google\zxing\client\result\AddressBookAUResultParser.java
+ZXing\core\src\com\google\zxing\client\result\AddressBookDoCoMoResultParser.java
+ZXing\core\src\com\google\zxing\client\result\AddressBookParsedResult.java
+ZXing\core\src\com\google\zxing\client\result\BizcardResultParser.java
+ZXing\core\src\com\google\zxing\client\result\BookmarkDoCoMoResultParser.java
+ZXing\core\src\com\google\zxing\client\result\CalendarParsedResult.java
+ZXing\core\src\com\google\zxing\client\result\EmailAddressParsedResult.java
+ZXing\core\src\com\google\zxing\client\result\EmailAddressResultParser.java
+ZXing\core\src\com\google\zxing\client\result\EmailDoCoMoResultParser.java
+ZXing\core\src\com\google\zxing\client\result\GeoParsedResult.java
+ZXing\core\src\com\google\zxing\client\result\GeoResultParser.java
+ZXing\core\src\com\google\zxing\client\result\ISBNParsedResult.java
+ZXing\core\src\com\google\zxing\client\result\ISBNResultParser.java
+ZXing\core\src\com\google\zxing\client\result\optional\AbstractNDEFResultParser.java
+ZXing\core\src\com\google\zxing\client\result\optional\NDEFRecord.java
+ZXing\core\src\com\google\zxing\client\result\optional\NDEFSmartPosterParsedResult.java
+ZXing\core\src\com\google\zxing\client\result\optional\NDEFSmartPosterResultParser.java
+ZXing\core\src\com\google\zxing\client\result\optional\NDEFTextResultParser.java
+ZXing\core\src\com\google\zxing\client\result\optional\NDEFURIResultParser.java
+ZXing\core\src\com\google\zxing\client\result\ParsedResult.java
+ZXing\core\src\com\google\zxing\client\result\ParsedResultType.java
+ZXing\core\src\com\google\zxing\client\result\ProductParsedResult.java
+ZXing\core\src\com\google\zxing\client\result\ProductResultParser.java
+ZXing\core\src\com\google\zxing\client\result\ResultParser.java
+ZXing\core\src\com\google\zxing\client\result\SMSMMSResultParser.java
+ZXing\core\src\com\google\zxing\client\result\SMSParsedResult.java
+ZXing\core\src\com\google\zxing\client\result\TelParsedResult.java
+ZXing\core\src\com\google\zxing\client\result\TelResultParser.java
+ZXing\core\src\com\google\zxing\client\result\TextParsedResult.java
+ZXing\core\src\com\google\zxing\client\result\URIParsedResult.java
+ZXing\core\src\com\google\zxing\client\result\URIResultParser.java
+ZXing\core\src\com\google\zxing\client\result\URLTOResultParser.java
+ZXing\core\src\com\google\zxing\client\result\VCardResultParser.java
+ZXing\core\src\com\google\zxing\client\result\VEventResultParser.java
+ZXing\javame\src\com\google\zxing\client\j2me\AdvancedMultimediaManager.java
+ZXing\javame\src\com\google\zxing\client\j2me\DefaultMultimediaManager.java
+ZXing\javame\src\com\google\zxing\client\j2me\LCDUIImageLuminanceSource.java
+ZXing\javame\src\com\google\zxing\client\j2me\Menu.java
+ZXing\javame\src\com\google\zxing\client\j2me\MultimediaManager.java
+ZXing\javame\src\com\google\zxing\client\j2me\SnapshotThread.java
+ZXing\javame\src\com\google\zxing\client\j2me\SplashThread.java
+ZXing\javame\src\com\google\zxing\client\j2me\VideoCanvas.java
+ZXing\javame\src\com\google\zxing\client\j2me\ZXingMIDlet.java
+]
+HaveAlxImports=0
+HaveDefs=0
+HaveImports=0
+[Icons
+]
+[ImplicitRules
+]
+[Imports
+]
+Listing=0
+Options=-quiet
+OutputFileName=barcode
+[PackageProtection
+]
+RibbonPosition=0
+[RolloverIcons
+]
+RunOnStartup=0
+StartupTier=7
+SystemModule=0
+Type=0
+UserData=|src
+Version=1.51

data/lib/extensions/barcode/ext/barcode/platform/iphone/Barcode.xcodeproj/project.pbxproj

@@ -60,7 +60,6 @@
 		FAAE075A11EF4F22001787D8 /* img_scanner.h in Headers */ = {isa = PBXBuildFile; fileRef = FAAE06EF11EF4F22001787D8 /* img_scanner.h */; };
 		FAAE075C11EF4F22001787D8 /* mutex.h in Headers */ = {isa = PBXBuildFile; fileRef = FAAE06F111EF4F22001787D8 /* mutex.h */; };
 		FAAE075E11EF4F22001787D8 /* null.c in Sources */ = {isa = PBXBuildFile; fileRef = FAAE06F411EF4F22001787D8 /* null.c */; };
-		FAAE076311EF4F22001787D8 /* processor.c in Sources */ = {isa = PBXBuildFile; fileRef = FAAE06F911EF4F22001787D8 /* processor.c */; };
 		FAAE076411EF4F22001787D8 /* processor.h in Headers */ = {isa = PBXBuildFile; fileRef = FAAE06FA11EF4F22001787D8 /* processor.h */; };
 		FAAE077311EF4F22001787D8 /* refcnt.c in Sources */ = {isa = PBXBuildFile; fileRef = FAAE070A11EF4F22001787D8 /* refcnt.c */; };
 		FAAE077411EF4F22001787D8 /* refcnt.h in Headers */ = {isa = PBXBuildFile; fileRef = FAAE070B11EF4F22001787D8 /* refcnt.h */; };
@@ -129,7 +128,6 @@
 		FAAE06EF11EF4F22001787D8 /* img_scanner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = img_scanner.h; sourceTree = "<group>"; };
 		FAAE06F111EF4F22001787D8 /* mutex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mutex.h; sourceTree = "<group>"; };
 		FAAE06F411EF4F22001787D8 /* null.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = null.c; sourceTree = "<group>"; };
-		FAAE06F911EF4F22001787D8 /* processor.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = processor.c; sourceTree = "<group>"; };
 		FAAE06FA11EF4F22001787D8 /* processor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = processor.h; sourceTree = "<group>"; };
 		FAAE070A11EF4F22001787D8 /* refcnt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = refcnt.c; sourceTree = "<group>"; };
 		FAAE070B11EF4F22001787D8 /* refcnt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = refcnt.h; sourceTree = "<group>"; };
@@ -310,7 +308,6 @@
 				FAAE06EF11EF4F22001787D8 /* img_scanner.h */,
 				FAAE06F111EF4F22001787D8 /* mutex.h */,
 				FAAE06F211EF4F22001787D8 /* processor */,
-				FAAE06F911EF4F22001787D8 /* processor.c */,
 				FAAE06FA11EF4F22001787D8 /* processor.h */,
 				FAAE070A11EF4F22001787D8 /* refcnt.c */,
 				FAAE070B11EF4F22001787D8 /* refcnt.h */,
@@ -444,7 +441,14 @@
 			isa = PBXProject;
 			buildConfigurationList = 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "Barcode" */;
 			compatibilityVersion = "Xcode 3.1";
+			developmentRegion = English;
 			hasScannedForEncodings = 1;
+			knownRegions = (
+				English,
+				Japanese,
+				French,
+				German,
+			);
 			mainGroup = 0867D691FE84028FC02AAC07 /* Barcode */;
 			productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
 			projectDirPath = "";
@@ -476,7 +480,6 @@
 				FAAE075711EF4F22001787D8 /* image.c in Sources */,
 				FAAE075911EF4F22001787D8 /* img_scanner.c in Sources */,
 				FAAE075E11EF4F22001787D8 /* null.c in Sources */,
-				FAAE076311EF4F22001787D8 /* processor.c in Sources */,
 				FAAE077311EF4F22001787D8 /* refcnt.c in Sources */,
 				FAAE077511EF4F22001787D8 /* scanner.c in Sources */,
 				FAAE077811EF4F22001787D8 /* symbol.c in Sources */,

data/lib/extensions/barcode/ext/barcode/platform/iphone/Rakefile

@@ -56,7 +56,8 @@ namespace "build" do
     # copy result to $targetdir
     result_lib = iphone_path + '/build/' + $configuration + '-' + ( simulator ? "iphonesimulator" : "iphoneos") + '/libBarcode.a'
     target_lib = $targetdir + '/libBarcode.a'
-    
+
+    mkdir_p $targetdir    
     cp result_lib,target_lib
 
   end

data/lib/extensions/barcode/ext/barcode/platform/wm/src/wm_imageprovider.cpp

@@ -11,7 +11,7 @@
 #include <commctrl.h>
 
 #include <imaging.h>
-#include <initguid.h>
+//#include <initguid.h>
 #include <imgguids.h>
 
 

data/lib/extensions/digest-sha1/ext/build.bat

@@ -0,0 +1 @@
+rake --trace