Permalink
Browse files

merging w/ 1.2

  • Loading branch information...
2 parents 12e8538 + 363507c commit 16d1ecd2fcee2dc1cb6ea43916a86783abc604d8 @larsburgess larsburgess committed Jun 3, 2009
Showing with 315,044 additions and 16,521 deletions.
  1. +1 −0 .gitignore
  2. +0 −9 Rakefile
  3. +18 −267 platform/android/Rhodes/build.xml
  4. +3 −3 platform/android/build/build.yml
  5. BIN platform/android/build/rhosdcard.7z
  6. +2 −1 platform/bb/Hsqldb/src/com/rho/db/FileUtilBB.java
  7. +5 −5 platform/bb/Hsqldb/src/com/rho/db/RandomAccessFile.java
  8. +5 −2 platform/bb/Hsqldb/src/org/hsqldb/persist/DataFileCache.java
  9. +14 −6 platform/bb/rhodes/src/com/rho/Jsr75File.java
  10. +2 −0 platform/bb/rhodes/src/rhomobile/RhodesApplication.java
  11. +1 −1 platform/iphone/Classes/Dispatcher/Dispatcher.c
  12. +1 −1 platform/iphone/Classes/Phonebook/phonebook.m
  13. +1 −1 platform/iphone/Classes/Server/ServerHost.m
  14. +1 −1 platform/iphone/Classes/WebViewController.m
  15. +28 −24 platform/iphone/rhorubylib/rhorubylib.xcodeproj/project.pbxproj
  16. +6 −6 platform/mac/RubyMac/RubyMac.xcodeproj/project.pbxproj
  17. BIN platform/mac/target/compiler/RubyMac
  18. +87 −50 platform/shared/ruby/array.c
  19. +7 −2 platform/shared/ruby/bignum.c
  20. +2 −2 platform/shared/ruby/blockinlining.c
  21. +46 −23 platform/shared/ruby/class.c
  22. +154 −59 platform/shared/ruby/compile.c
  23. +78 −51 platform/shared/ruby/complex.c
  24. +329 −87 platform/shared/ruby/cont.c
  25. +56 −38 platform/shared/ruby/dir.c
  26. +56 −13 platform/shared/ruby/dln.c
  27. +1 −2 platform/shared/ruby/enc/Makefile.in
  28. +28 −15 platform/shared/ruby/enc/depend
  29. +0 −77 platform/shared/ruby/enc/make_encdb.rb
  30. +7,618 −0 platform/shared/ruby/enc/trans/GB/GB12345%UCS.src
  31. +7,535 −0 platform/shared/ruby/enc/trans/GB/GB2312%UCS.src
  32. +7,620 −0 platform/shared/ruby/enc/trans/GB/UCS%GB12345.src
  33. +7,531 −0 platform/shared/ruby/enc/trans/GB/UCS%GB2312.src
  34. +13,705 −0 platform/shared/ruby/enc/trans/big5-tbl.rb
  35. +16,288 −0 platform/shared/ruby/enc/trans/big5.c
  36. +16 −0 platform/shared/ruby/enc/trans/big5.trans
  37. +21,679 −0 platform/shared/ruby/enc/trans/chinese.c
  38. +30 −0 platform/shared/ruby/enc/trans/chinese.trans
  39. +130 −0 platform/shared/ruby/enc/trans/cp850-tbl.rb
  40. +130 −0 platform/shared/ruby/enc/trans/cp852-tbl.rb
  41. +130 −0 platform/shared/ruby/enc/trans/cp855-tbl.rb
  42. +5 −5 platform/shared/ruby/enc/trans/escape.c
  43. +63,330 −0 platform/shared/ruby/enc/trans/gb18030-tbl.rb
  44. +95,467 −0 platform/shared/ruby/enc/trans/gb18030.c
  45. +84 −0 platform/shared/ruby/enc/trans/gb18030.trans
  46. +21,793 −0 platform/shared/ruby/enc/trans/gbk-tbl.rb
  47. +20,694 −0 platform/shared/ruby/enc/trans/gbk.c
  48. +16 −0 platform/shared/ruby/enc/trans/gbk.trans
  49. +130 −0 platform/shared/ruby/enc/trans/ibm437-tbl.rb
  50. +130 −0 platform/shared/ruby/enc/trans/ibm775-tbl.rb
  51. +130 −0 platform/shared/ruby/enc/trans/ibm852-tbl.rb
  52. +130 −0 platform/shared/ruby/enc/trans/ibm855-tbl.rb
  53. +127 −0 platform/shared/ruby/enc/trans/ibm857-tbl.rb
  54. +130 −0 platform/shared/ruby/enc/trans/ibm860-tbl.rb
  55. +130 −0 platform/shared/ruby/enc/trans/ibm861-tbl.rb
  56. +130 −0 platform/shared/ruby/enc/trans/ibm862-tbl.rb
  57. +130 −0 platform/shared/ruby/enc/trans/ibm863-tbl.rb
  58. +130 −0 platform/shared/ruby/enc/trans/ibm865-tbl.rb
  59. +130 −0 platform/shared/ruby/enc/trans/ibm866-tbl.rb
  60. +121 −0 platform/shared/ruby/enc/trans/ibm869-tbl.rb
  61. +98 −0 platform/shared/ruby/enc/trans/iso-8859-1-tbl.rb
  62. +3 −3 platform/shared/ruby/enc/trans/iso2022.c
  63. +1 −1 platform/shared/ruby/enc/trans/japanese.c
  64. +1 −1 platform/shared/ruby/enc/trans/japanese_euc.c
  65. +1 −1 platform/shared/ruby/enc/trans/japanese_sjis.c
  66. +130 −0 platform/shared/ruby/enc/trans/koi8-r-tbl.rb
  67. +130 −0 platform/shared/ruby/enc/trans/koi8-u-tbl.rb
  68. +1 −1 platform/shared/ruby/enc/trans/korean.c
  69. +129 −0 platform/shared/ruby/enc/trans/maccroatian-tbl.rb
  70. +130 −0 platform/shared/ruby/enc/trans/maccyrillic-tbl.rb
  71. +129 −0 platform/shared/ruby/enc/trans/macgreek-tbl.rb
  72. +129 −0 platform/shared/ruby/enc/trans/maciceland-tbl.rb
  73. +129 −0 platform/shared/ruby/enc/trans/macroman-tbl.rb
  74. +129 −0 platform/shared/ruby/enc/trans/macromania-tbl.rb
  75. +128 −0 platform/shared/ruby/enc/trans/macturkish-tbl.rb
  76. +130 −0 platform/shared/ruby/enc/trans/macukraine-tbl.rb
  77. +0 −57 platform/shared/ruby/enc/trans/make_transdb.rb
  78. +185 −0 platform/shared/ruby/enc/trans/newline.c
  79. +8,710 −1,683 platform/shared/ruby/enc/trans/single_byte.c
  80. +63 −54 platform/shared/ruby/enc/trans/single_byte.trans
  81. +89 −0 platform/shared/ruby/enc/trans/tis-620-tbl.rb
  82. +1 −1 platform/shared/ruby/enc/trans/utf_16_32.c
  83. +1 −1 platform/shared/ruby/enc/us_ascii.c
  84. +147 −0 platform/shared/ruby/encdb.h
  85. +133 −40 platform/shared/ruby/encoding.c
  86. +7 −3 platform/shared/ruby/enum.c
  87. +24 −8 platform/shared/ruby/enumerator.c
  88. +39 −7 platform/shared/ruby/error.c
  89. +23 −119 platform/shared/ruby/eval.c
  90. +15 −9 platform/shared/ruby/eval_intern.h
  91. +10 −10 platform/shared/ruby/ext/geolocation/geolocation.i
  92. +1,852 −1,852 platform/shared/ruby/ext/geolocation/geolocation_wrap.c
  93. +5 −3 platform/shared/ruby/{rhoruby → ext/rho}/rhoruby.c
  94. 0 platform/shared/ruby/{rhoruby → ext/rho}/rhoruby.h
  95. +4 −5 platform/shared/ruby/ext/{rhosupport → rho}/rhosupport.c
  96. +18 −0 platform/shared/ruby/ext/stringio/README
  97. +3 −0 platform/shared/ruby/ext/stringio/depend
  98. +2 −0 platform/shared/ruby/ext/stringio/extconf.rb
  99. +1,369 −0 platform/shared/ruby/ext/stringio/stringio.c
  100. +27 −27 platform/shared/ruby/ext/system/network.c
  101. +7 −7 platform/shared/ruby/ext/webview/webview_wrap.c
  102. +55 −80 platform/shared/ruby/file.c
  103. +117 −36 platform/shared/ruby/gc.c
  104. +177 −178 platform/shared/ruby/generated/insns.inc
  105. +688 −688 platform/shared/ruby/generated/insns_info.inc
  106. +616 −0 platform/shared/ruby/generated/known_errors.inc
  107. +216 −216 platform/shared/ruby/generated/node_name.inc
  108. +30 −30 platform/shared/ruby/generated/optinsn.inc
  109. +5,460 −4,471 platform/shared/ruby/generated/parse.c
  110. +35 −140 platform/shared/ruby/generated/parse.h
  111. +55 −54 platform/shared/ruby/generated/vm.inc
  112. +133 −0 platform/shared/ruby/golf_prelude.c
  113. +17 −5 platform/shared/ruby/hash.c
  114. +50 −71 platform/shared/ruby/id.h
  115. +0 −29 platform/shared/ruby/include/ruby/backward/.svn/all-wcprops
  116. +0 −80 platform/shared/ruby/include/ruby/backward/.svn/entries
  117. +0 −1 platform/shared/ruby/include/ruby/backward/.svn/format
  118. +0 −9 platform/shared/ruby/include/ruby/backward/.svn/prop-base/rubyio.h.svn-base
  119. +0 −9 platform/shared/ruby/include/ruby/backward/.svn/prop-base/rubysig.h.svn-base
  120. +0 −9 platform/shared/ruby/include/ruby/backward/.svn/prop-base/st.h.svn-base
  121. +0 −9 platform/shared/ruby/include/ruby/backward/.svn/prop-base/util.h.svn-base
  122. +0 −6 platform/shared/ruby/include/ruby/backward/.svn/text-base/rubyio.h.svn-base
  123. +0 −33 platform/shared/ruby/include/ruby/backward/.svn/text-base/rubysig.h.svn-base
  124. +0 −6 platform/shared/ruby/include/ruby/backward/.svn/text-base/st.h.svn-base
  125. +0 −6 platform/shared/ruby/include/ruby/backward/.svn/text-base/util.h.svn-base
  126. +20 −5 platform/shared/ruby/include/ruby/backward/rubysig.h
  127. +1 −20 platform/shared/ruby/include/ruby/defines.h
  128. +4 −0 platform/shared/ruby/include/ruby/encoding.h
  129. +43 −2 platform/shared/ruby/include/ruby/intern.h
  130. +4 −1 platform/shared/ruby/include/ruby/io.h
  131. +45 −31 platform/shared/ruby/include/ruby/missing.h
  132. +2 −1 platform/shared/ruby/include/ruby/ruby.h
  133. +15 −1 platform/shared/ruby/include/ruby/st.h
  134. +9 −4 platform/shared/ruby/include/ruby/vm.h
  135. +5 −30 platform/shared/ruby/include/ruby/win32.h
  136. +47 −88 platform/shared/ruby/inits.c
  137. +6 −5 platform/shared/ruby/insns.def
  138. +531 −300 platform/shared/ruby/io.c
  139. +23 −23 platform/shared/ruby/iphone/crt_externs.h
  140. +5 −12 platform/shared/ruby/iphone/ruby/config.h
  141. +53 −43 platform/shared/ruby/iseq.c
  142. +12 −3 platform/shared/ruby/iseq.h
  143. +42 −21 platform/shared/ruby/load.c
  144. +5 −4 platform/shared/ruby/main.c
  145. +87 −56 platform/shared/ruby/math.c
  146. +8 −6 platform/shared/ruby/miniprelude.c
  147. +146 −0 platform/shared/ruby/missing/langinfo.c
  148. +0 −908 platform/shared/ruby/missing/strftime.c
  149. +23 −7 platform/shared/ruby/missing/vsnprintf.c
  150. +1 −1 platform/shared/ruby/newline.c
  151. +2 −2 platform/shared/ruby/node.h
  152. +60 −26 platform/shared/ruby/numeric.c
  153. +18 −3 platform/shared/ruby/object.c
  154. +36 −6 platform/shared/ruby/pack.c
  155. +117 −74 platform/shared/ruby/parse.y
  156. +54 −34 platform/shared/ruby/proc.c
  157. +77 −55 platform/shared/ruby/process.c
  158. +2 −2 platform/shared/ruby/random.c
  159. +7 −2 platform/shared/ruby/range.c
  160. +43 −15 platform/shared/ruby/rational.c
  161. +37 −35 platform/shared/ruby/re.c
  162. +1 −1 platform/shared/ruby/regenc.c
  163. +1 −1 platform/shared/ruby/regerror.c
  164. +6 −2 platform/shared/ruby/regparse.c
  165. +1 −1 platform/shared/ruby/revision.h
  166. +1,887 −1,660 platform/shared/ruby/ruby.c
  167. +4 −1 platform/shared/ruby/safe.c
  168. +78 −14 platform/shared/ruby/signal.c
  169. +16 −15 platform/shared/ruby/sprintf.c
  170. +21 −24 platform/shared/ruby/st.c
  171. +0 −17 platform/shared/ruby/stat/stat.c
  172. +0 −28 platform/shared/ruby/stat/stat.h
  173. +66 −40 platform/shared/ruby/strftime.c
  174. +192 −67 platform/shared/ruby/string.c
  175. +14 −9 platform/shared/ruby/struct.c
  176. +306 −231 platform/shared/ruby/thread.c
  177. +171 −24 platform/shared/ruby/thread_pthread.c
  178. +24 −8 platform/shared/ruby/thread_win32.c
  179. +3 −3 platform/shared/ruby/time.c
  180. +150 −85 platform/shared/ruby/transcode.c
  181. +9 −2 platform/shared/ruby/transcode_data.h
  182. +147 −0 platform/shared/ruby/transdb.h
  183. +67 −68 platform/shared/ruby/util.c
  184. +83 −62 platform/shared/ruby/variable.c
  185. +19 −24 platform/shared/ruby/version.h
  186. +110 −60 platform/shared/ruby/vm.c
  187. +19 −20 platform/shared/ruby/vm_core.h
  188. +59 −47 platform/shared/ruby/vm_dump.c
  189. +183 −49 platform/shared/ruby/vm_eval.c
  190. +4 −4 platform/shared/ruby/vm_exec.c
  191. +4 −7 platform/shared/ruby/vm_exec.h
  192. +202 −134 platform/shared/ruby/vm_insnhelper.c
  193. +6 −5 platform/shared/ruby/vm_insnhelper.h
  194. +12 −25 platform/shared/ruby/vm_method.c
  195. +4 −4 platform/shared/ruby/win32/miniprelude.c
  196. +1 −1 platform/shared/ruby/win32/newline.c
  197. +141 −139 platform/shared/ruby/win32/ruby/config.h
  198. +408 −352 platform/shared/ruby/win32/win32.c
  199. +63 −63 platform/shared/ruby/wince/_time.h
  200. +76 −76 platform/shared/ruby/wince/commit.c
  201. +246 −13 platform/shared/ruby/wince/io_wce.c
  202. +10 −0 platform/shared/ruby/wince/process_wce.c
  203. +3 −3 platform/shared/ruby/wince/ruby/config.h
  204. +4 −0 platform/shared/ruby/wince/stdlib.c
  205. +1 −1 platform/shared/rubyJVM/src/com/rho/RhoConf.java
  206. +8 −6 platform/shared/rubyJVM/src/com/xruby/runtime/lang/RubyExceptionValue.java
  207. +1 −1 platform/shared/shttpd/src/rdispatcher.c
  208. +46 −61 platform/win32/RubyWin/RubyWin.sln
  209. +2 −2 platform/win32/RubyWin/RubyWin.vcproj
  210. BIN platform/win32/target/compiler/RhoRuby.exe
  211. +1 −1 platform/wm/rhodes/AppManager.cpp
  212. +1 −1 platform/wm/rhodes/HttpServer.cpp
  213. +1 −1 platform/wm/rhodes/MainWindow.cpp
  214. +1 −1 platform/wm/rhodes/camera/Camera.cpp
  215. +1 −1 platform/wm/rhodes/phonebook/phonebook.cpp
  216. +28 −32 platform/wm/rubylib/rubylib.vcproj
  217. +6 −6 platform/wm/shttpd/shttpd.vcproj
  218. +0 −1 rhodes/rhodes-build/Manifest.txt
  219. +5 −13 rhodes/rhodes-build/lib/tasks/android.rake
  220. +1 −1 rhodes/rhodes-build/lib/tasks/blackberry.rake
  221. BIN rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/camera/ImageCapture$1.class
  222. BIN rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/camera/ImageCapture$2.class
  223. BIN rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/camera/ImageCapture$3.class
  224. BIN rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/camera/ImageCapture.class
  225. BIN rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/db/SqliteDBResult.class
  226. BIN rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/builtin/InputStreamExecutor.class
  227. BIN rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyExceptionValue.class
  228. BIN rhodes/rhodes-build/res/prebuilt/android/rhosdcard.7z
  229. +121 −80 rhodes/rhodes-framework/lib/date.rb
  230. +44 −42 rhodes/rhodes-framework/lib/date/format.rb
  231. +278 −238 rhodes/rhodes-framework/lib/erb.rb
  232. +2 −2 rhodes/rhodes-framework/lib/rational.rb
  233. +3 −3 rhodes/rhodes-framework/lib/singleton.rb
  234. +20 −2 rhodes/rhodes-framework/lib/time.rb
View
@@ -3,6 +3,7 @@
.DS_Store
rhodes/*/pkg/
rhodes/rhodes-framework/spec/bin/
+platform/mac/**/build/*
platform/iphone/build/*
platform/iphone/rhorubylib/build/*
platform/iphone/rhosynclib/build/*
View
@@ -265,12 +265,6 @@ task :prebuild_win do
eclipse_home = config["env"]["paths"]["eclipse_home"]
javac_home = config["env"]["paths"]["javac_home"]
- puts "Compile RubyJVM"
- chdir basedir
- chdir 'platform/android/RubyJVM'
- puts `#{ant} clean`
- puts `#{ant} build -DECLIPSE_HOME="#{eclipse_home}"`
-
puts "Compile RhoBundle, required by Rhodes"
chdir basedir
chdir 'platform/android/RhoBundle'
@@ -310,9 +304,6 @@ task :prebuild_win do
puts "copy loading.html"
cp File.join( basedir, 'platform', 'android', 'Rhodes', 'assets', 'apps', 'loading.html' ), File.join( basedir, prebuilt )
- puts "copy rhosdcard.7z"
- cp File.join( basedir, 'platform', 'android', 'build', 'rhosdcard.7z' ), File.join( basedir, prebuilt )
-
end
desc "Update prebuild binaries on mac"
@@ -12,133 +12,48 @@
<property name="debuglevel" value="source,lines,vars"/>
<property name="target" value="1.5"/>
<property name="source" value="1.5"/>
- <path id="Android Library.libraryclasspath">
+ <path id="Android 1.1.libraryclasspath">
<pathelement location="${ANDROID_SDK}/android.jar"/>
</path>
<path id="RubyJVM.classpath">
<pathelement location="${RubyJVM.location}/bin"/>
</path>
<path id="Rhodes.classpath">
<pathelement location="bin"/>
- <path refid="Android Library.libraryclasspath"/>
+ <path refid="Android 1.1.libraryclasspath"/>
<pathelement location="libs/RhoBundle.jar"/>
<path refid="RubyJVM.classpath"/>
</path>
- <!-- Application Package Name -->
- <property name="application-package" value="com.rhomobile.rhodes" />
-
- <!-- The intermediates directory, Eclipse uses "bin"
- for its own output, so we do the same. -->
- <property name="outdir" value="bin" />
-
- <!-- ************************************************************************************* -->
- <!-- No user servicable parts below. -->
-
- <property name="android-tools" value="${ANDROID_SDK}/tools" />
- <property name="android-framework" value="${android-tools}/lib/framework.aidl" />
-
- <!-- Input directories -->
- <property name="resource-dir" value="res" />
- <property name="asset-dir" value="assets" />
- <property name="srcdir" value="src" />
- <condition property="srcdir-ospath"
- value="${basedir}\${srcdir}"
- else="${basedir}/${srcdir}" >
- <os family="windows"/>
- </condition>
-
- <!-- folder for the 3rd party java libraries -->
- <property name="external-libs" value="libs" />
- <condition property="external-libs-ospath"
- value="${basedir}\${external-libs}"
- else="${basedir}/${external-libs}" >
- <os family="windows"/>
- </condition>
-
- <!-- folder for the native libraries -->
- <property name="native-libs" value="libs" />
- <condition property="native-libs-ospath"
- value="${basedir}\${native-libs}"
- else="${basedir}/${native-libs}" >
- <os family="windows"/>
- </condition>
-
- <!-- Output directories -->
- <property name="outdir-classes" value="${outdir}" />
- <condition property="outdir-classes-ospath"
- value="${basedir}\${outdir-classes}"
- else="${basedir}/${outdir-classes}" >
- <os family="windows"/>
- </condition>
-
- <!-- Create R.java in the source directory -->
- <property name="outdir-r" value="src" />
-
- <!-- Intermediate files -->
- <property name="dex-file" value="classes.dex" />
- <property name="intermediate-dex" value="${outdir}/${dex-file}" />
- <condition property="intermediate-dex-ospath"
- value="${basedir}\${intermediate-dex}"
- else="${basedir}/${intermediate-dex}" >
- <os family="windows"/>
- </condition>
-
- <!-- The final package file to generate -->
- <property name="resources-package" value="${outdir}/${ant.project.name}.ap_" />
- <condition property="resources-package-ospath"
- value="${basedir}\${resources-package}"
- else="${basedir}/${resources-package}" >
- <os family="windows"/>
- </condition>
-
- <property name="out-debug-package" value="${outdir}/${ant.project.name}-debug.apk" />
- <condition property="out-debug-package-ospath"
- value="${basedir}\${out-debug-package}"
- else="${basedir}/${out-debug-package}" >
- <os family="windows"/>
- </condition>
-
- <property name="out-unsigned-package" value="${outdir}/${ant.project.name}-unsigned.apk" />
- <condition property="out-unsigned-package-ospath"
- value="${basedir}\${out-unsigned-package}"
- else="${basedir}/${out-unsigned-package}" >
- <os family="windows"/>
- </condition>
-
- <!-- Tools -->
- <condition property="aapt" value="${android-tools}/aapt.exe" else="${android-tools}/aapt" >
- <os family="windows"/>
- </condition>
- <condition property="aidl" value="${android-tools}/aidl.exe" else="${android-tools}/aidl" >
- <os family="windows"/>
- </condition>
- <condition property="adb" value="${android-tools}/adb.exe" else="${android-tools}/adb" >
- <os family="windows"/>
- </condition>
- <condition property="dx" value="${android-tools}/dx.bat" else="${android-tools}/dx" >
- <os family="windows"/>
- </condition>
- <condition property="apk-builder" value="${android-tools}/apkbuilder.bat" else="${android-tools}/apkbuilder" >
- <os family="windows"/>
- </condition>
-
- <property name="android-jar" value="${sdk-folder}/android.jar" />
<target name="init">
<mkdir dir="bin"/>
<copy includeemptydirs="false" todir="bin">
<fileset dir="src" excludes="**/*.launch, **/*.java"/>
</copy>
+ <copy includeemptydirs="false" todir="bin">
+ <fileset dir="gen" excludes="**/*.launch, **/*.java"/>
+ </copy>
</target>
<target name="clean">
<delete dir="bin"/>
</target>
<target depends="clean" name="cleanall">
<ant antfile="${RubyJVM.location}/build.xml" inheritAll="false" target="clean"/>
</target>
- <target depends="build-project" name="build"/>
+ <target depends="build-subprojects,build-project" name="build"/>
+ <target name="build-subprojects">
+ <ant antfile="${RubyJVM.location}/build.xml" inheritAll="false" target="build-project">
+ <propertyset>
+ <propertyref name="build.compiler"/>
+ </propertyset>
+ </ant>
+ </target>
<target depends="init" name="build-project">
<echo message="${ant.project.name}: ${ant.file}"/>
- <javac debug="true" debuglevel="${debuglevel}" destdir="bin" source="${source}" target="${target}">
+ <javac debug="true" debuglevel="${debuglevel}" destdir="bin" source="${source}" target="${target}">
+ <src path="gen"/>
+ <classpath refid="Rhodes.classpath"/>
+ </javac>
+ <javac debug="true" debuglevel="${debuglevel}" destdir="bin" source="${source}" target="${target}">
<src path="src"/>
<classpath refid="Rhodes.classpath"/>
</javac>
@@ -157,168 +72,4 @@
<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
<antcall target="build"/>
</target>
-
- <!-- Rules -->
-
- <!-- Create the output directories if they don't exist yet. -->
- <target name="dirs">
- <echo>Creating output directories if needed...</echo>
- <mkdir dir="${outdir}" />
- <mkdir dir="${outdir-classes}" />
- </target>
-
- <!-- Generate the R.java file for this project's resources. -->
- <target name="resource-src" depends="dirs">
- <echo>Generating R.java / Manifest.java from the resources...</echo>
- <exec executable="${aapt}" failonerror="true">
- <arg value="package" />
- <arg value="-m" />
- <arg value="-J" />
- <arg value="${outdir-r}" />
- <arg value="-M" />
- <arg value="AndroidManifest.xml" />
- <arg value="-S" />
- <arg value="${resource-dir}" />
- <arg value="-I" />
- <arg value="${android-jar}" />
- </exec>
- </target>
-
- <!-- Generate java classes from .aidl files. -->
- <target name="aidl" depends="dirs">
- <echo>Compiling aidl files into Java classes...</echo>
- <apply executable="${aidl}" failonerror="true">
- <arg value="-p${android-framework}" />
- <arg value="-I${srcdir}" />
- <fileset dir="${srcdir}">
- <include name="**/*.aidl"/>
- </fileset>
- </apply>
- </target>
-
- <!-- Convert this project's .class files into .dex files. -->
- <target name="dex" depends="build">
- <echo>Converting compiled files and external libraries into ${outdir}/${dex-file}...</echo>
- <apply executable="${dx}" failonerror="true" parallel="true">
- <arg value="--dex" />
- <arg value="--output=${intermediate-dex-ospath}" />
- <arg path="${outdir-classes-ospath}" />
- <fileset dir="${external-libs}" includes="*.jar"/>
- </apply>
- </target>
-
- <!-- Put the project's resources into the output package file. -->
- <target name="package-res-and-assets">
- <echo>Packaging resources and assets...</echo>
- <exec executable="${aapt}" failonerror="true">
- <arg value="package" />
- <arg value="-f" />
- <arg value="-M" />
- <arg value="AndroidManifest.xml" />
- <arg value="-S" />
- <arg value="${resource-dir}" />
- <arg value="-A" />
- <arg value="${asset-dir}" />
- <arg value="-I" />
- <arg value="${android-jar}" />
- <arg value="-F" />
- <arg value="${resources-package}" />
- </exec>
- </target>
-
- <!-- Same as package-res-and-assets, but without "-A ${asset-dir}" -->
- <target name="package-res-no-assets">
- <echo>Packaging resources...</echo>
- <exec executable="${aapt}" failonerror="true">
- <arg value="package" />
- <arg value="-f" />
- <arg value="-M" />
- <arg value="AndroidManifest.xml" />
- <arg value="-S" />
- <arg value="${resource-dir}" />
- <!-- No assets directory -->
- <arg value="-I" />
- <arg value="${android-jar}" />
- <arg value="-F" />
- <arg value="${resources-package}" />
- </exec>
- </target>
-
- <!-- Invoke the proper target depending on whether or not
- an assets directory is present. -->
- <!-- TODO: find a nicer way to include the "-A ${asset-dir}" argument
- only when the assets dir exists. -->
- <target name="package-res">
- <available file="${asset-dir}" type="dir"
- property="res-target" value="and-assets" />
- <property name="res-target" value="no-assets" />
- <antcall target="package-res-${res-target}" />
- </target>
-
- <!-- Package the application and sign it with a debug key.
- This is the default target when building. It is used for debug. -->
- <target name="debug" depends="dex, package-res">
- <echo>Packaging ${out-debug-package}, and signing it with a debug key...</echo>
- <exec executable="${apk-builder}" failonerror="true">
- <arg value="${out-debug-package-ospath}" />
- <arg value="-z" />
- <arg value="${resources-package-ospath}" />
- <arg value="-f" />
- <arg value="${intermediate-dex-ospath}" />
- <arg value="-rf" />
- <arg value="${srcdir-ospath}" />
- <arg value="-rj" />
- <arg value="${external-libs-ospath}" />
- <arg value="-nf" />
- <arg value="${native-libs-ospath}" />
- </exec>
- </target>
-
- <!-- Package the application without signing it.
- This allows for the application to be signed later with an official publishing key. -->
- <target name="release" depends="dex, package-res">
- <echo>Packaging ${out-unsigned-package} for release...</echo>
- <exec executable="${apk-builder}" failonerror="true">
- <arg value="${out-unsigned-package-ospath}" />
- <arg value="-u" />
- <arg value="-z" />
- <arg value="${resources-package-ospath}" />
- <arg value="-f" />
- <arg value="${intermediate-dex-ospath}" />
- <arg value="-rf" />
- <arg value="${srcdir-ospath}" />
- <arg value="-rj" />
- <arg value="${external-libs-ospath}" />
- <arg value="-nf" />
- <arg value="${native-libs-ospath}" />
- </exec>
- <echo>It will need to be signed with jarsigner before being published.</echo>
- </target>
-
- <!-- Install the package on the default emulator -->
- <target name="install" depends="debug">
- <echo>Installing ${out-debug-package} onto default emulator...</echo>
- <exec executable="${adb}" failonerror="true">
- <arg value="install" />
- <arg value="${out-debug-package}" />
- </exec>
- </target>
-
- <target name="reinstall" depends="debug">
- <echo>Installing ${out-debug-package} onto default emulator...</echo>
- <exec executable="${adb}" failonerror="true">
- <arg value="install" />
- <arg value="-r" />
- <arg value="${out-debug-package}" />
- </exec>
- </target>
-
- <!-- Uinstall the package from the default emulator -->
- <target name="uninstall">
- <echo>Uninstalling ${application-package} from the default emulator...</echo>
- <exec executable="${adb}" failonerror="true">
- <arg value="uninstall" />
- <arg value="${application-package}" />
- </exec>
- </target>
</project>
@@ -1,5 +1,5 @@
env:
paths:
- android_sdk: C:/android-sdk-windows-1.1_r1
- eclipse_home: C:/dev/eclipse
- javac_home: C:/Program Files/Java/jdk1.6.0_10/bin
+ android_sdk: E:/android-sdk-windows-1.5_r2/android-sdk-windows-1.5_r2/platforms/android-1.1
+ eclipse_home: E:/tmp/wtp/eclipse
+ javac_home: E:/Program Files/Java/jdk1.6.0_02/bin
Binary file not shown.
@@ -121,7 +121,8 @@ public void delete(String filename)
//if ( fc.isDirectory() )
// deleteFilesInFolder(fc);
- fconn.delete();
+ if ( fconn != null && fconn.exists() )
+ fconn.delete();
}catch(IOException exc){
System.out.println("FileUtilBB:delete '" + filename + "' Exception: " + exc.getMessage());
}finally{
Oops, something went wrong.

0 comments on commit 16d1ecd

Please sign in to comment.