Fix a bug and update version numbers for release

olabini · Apr 22, 2009 · ea479c2 · ea479c2
1 parent 0255cf4
commit ea479c2
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 14 deletions.
diff --git a/build.xml b/build.xml
@@ -44,9 +44,9 @@
 
   <target name="compile" depends="generate, generate_filters" description="Compile the source files for the project.">
     <filter filtersfile="version_data.properties"/>
-    <filter token="VERSION" value="P"/>
+    <filter token="VERSION" value="E"/>
-    <filter token="VERSION_RUNTIME" value="0.4.0-snapshot"/>
+    <filter token="VERSION_RUNTIME" value="0.3.1"/>
-    <filter token="VERSION_STRING" value="Ioke P ikj 0.4.0-snapshot"/>
+    <filter token="VERSION_STRING" value="Ioke E ikj 0.3.1"/>
 
     <javac destdir="${classes.dir}" debug="true" source="${javac.version}" target="${javac.version}">
       <classpath refid="build.classpath"/>
@@ -151,7 +151,7 @@
   </target>
 
   <target name="dist-bin" depends="jar">
-    <tar destfile="${release.dir}/ioke-P-ikj-0.4.0-snapshot.tar.gz" compression="gzip">
+    <tar destfile="${release.dir}/ioke-E-ikj-0.3.1.tar.gz" compression="gzip">
       <tarfileset mode="755" dir="." prefix="ioke">
         <include name="bin/*.bat"/>
         <include name="bin/dokgen"/>
@@ -171,7 +171,7 @@
       </tarfileset>
     </tar>
 
-    <zip destfile="${release.dir}/ioke-P-ikj-0.4.0-snapshot.zip">
+    <zip destfile="${release.dir}/ioke-E-ikj-0.3.1.zip">
       <zipfileset filemode="755" dir="." prefix="ioke">
         <include name="bin/*.bat"/>
         <include name="bin/dokgen"/>

diff --git a/ioke-ikc.build b/ioke-ikc.build
@@ -90,8 +90,8 @@
     </script>
 
     <echo file="${build.filtered.dir}/Ioke.Lang.version.properties">ioke.build.version=E
-ioke.build.runtimeVersion=0.2.0-snapshot
+ioke.build.runtimeVersion=0.1.1
-ioke.build.versionString=Ioke E ikc 0.2.0-snapshot
+ioke.build.versionString=Ioke E ikc 0.1.1
 ioke.build.date=${version::extract-date()}
 ioke.build.commit=${version::extract-commit()}
     </echo>
@@ -168,7 +168,7 @@ ioke.build.commit=${version::extract-commit()}
   </target>
 
   <target name="dist-bin">
-    <tar destfile="${release.dir}/ioke-E-ikc-0.2.0-snapshot.tar.gz" compression="GZip">
+    <tar destfile="${release.dir}/ioke-E-ikc-0.1.1.tar.gz" compression="GZip">
       <fileset filemode="755" basedir="." prefix="ioke">
         <include name="bin/*.dll"/>
         <include name="bin/*.exe"/>
@@ -188,7 +188,7 @@ ioke.build.commit=${version::extract-commit()}
       </fileset>
     </tar>
 
-    <zip zipfile="${release.dir}/ioke-E-ikc-0.2.0-snapshot.zip">
+    <zip zipfile="${release.dir}/ioke-E-ikc-0.1.1.zip">
       <fileset basedir="." prefix="ioke">
         <include name="bin/*.dll"/>
         <include name="bin/*.exe"/>

diff --git a/lib/ioke/dokgen/collector.ik b/lib/ioke/dokgen/collector.ik
@@ -1,6 +1,9 @@
 
 DokGen do(
-  KindsToAvoid = [DokGen, JavaGround]
+  KindsToAvoid = [DokGen]
+
+  if(System feature?(:java),
+    KindsToAvoid << JavaGround)
 
   collect = method(
     current, collected, 

diff --git a/src/ikc/builtin/D50_runtime.ik b/src/ikc/builtin/D50_runtime.ik
@@ -1,2 +1,2 @@
 
-Runtime version = Origin with(machine: "ikc", versionNumber: [0,2,0])
+Runtime version = Origin with(machine: "ikc", versionNumber: [0,1,1])
diff --git a/src/ikj/builtin/D50_runtime.ik b/src/ikj/builtin/D50_runtime.ik
@@ -1,2 +1,2 @@
 
-Runtime version = Origin with(machine: "ikj", versionNumber: [0,4,0])
+Runtime version = Origin with(machine: "ikj", versionNumber: [0,3,1])
diff --git a/test/runtime_spec.ik b/test/runtime_spec.ik
@@ -25,13 +25,13 @@ describe(Runtime,
     describe("versionNumber",
       onlyWhen(System feature?(:java),
         it("should be the correct version",
-          Runtime version versionNumber should == [0,4,0]
+          Runtime version versionNumber should == [0,3,1]
         )
       )
 
       onlyWhen(System feature?(:clr),
         it("should be the correct version",
-          Runtime version versionNumber should == [0,2,0]
+          Runtime version versionNumber should == [0,1,1]
         )
       )
     )