Changeset 25

Timestamp:

02/09/10 21:44:43 (7 months ago)

Author:

gabe

Message:

Added svn revision number, architecture and type of image import module to the file name of generated archives.

Location:

trunk

Files:

• build.xml (modified) (7 diffs)
• win32/SamHaXe.nsi (modified) (3 diffs)

trunk/build.xml

@@ -4 +4 @@
    </description>
 
-   <property name="version" value="1.0-mojito"/>
+   <property name="version.name" value="1.0-mojito"/>
    
    <property environment="env"/>
@@ -136 +136 @@
    <property name="neko.library.path" value="."/>
 
+   <!-- FreeType defaults -->
    <condition property="freetype.include.path" value="/usr/include">
       <or>
@@ -160 +161 @@
       <equals arg1="${haxe.debug}" arg2="false"/>
    </condition>
-      
+
+   <!-- NaturalDocs defaults -->
    <condition property="naturaldocs.executable" value="${naturaldocs.path}/NaturalDocs.bat">
       <isset property="is-windows"/>
@@ -234 +236 @@
    </path>
   
-   <!-- -init target: create directory structure -->
+   <!-- -init target: create directory structure and acquire actual svn revision number-->
    <target name="-init">
       <mkdir dir="${objdir}"/>
@@ -245 +247 @@
       <mkdir dir="${demodir.bin.apps}"/>
       <mkdir dir="${distdir}"/>
+   </target>
+   
+   <!-- -version target: set version related properties -->
+   <target name="-version">
+      <!-- acquire svn revision -->
+      <exec executable="svn" dir="${basedir}" outputproperty="svn.info" resultproperty="svn.result" failonerror="false">
+         <arg value="info"/>
+      </exec>
+      
+      <loadresource property="svn.revision">
+         <propertyresource name="svn.info"/>
+         <filterchain>
+            <linecontains>
+               <contains value="Revision:"/>
+            </linecontains>
+            <tokenfilter>
+               <stringtokenizer suppressdelims="true"/>
+               <containsregex pattern="[0-9]+"/>
+            </tokenfilter>
+         </filterchain>
+      </loadresource>
+      
+      <condition property="version.revision" value="r${svn.revision}">
+         <and>
+            <isset property="svn.result"/>
+            <not>
+               <equals arg1="svn.revision" arg2=""/>
+            </not>
+         </and>
+      </condition>
+      <property name="version.revision" value="unknown"/>
+      
+      <!-- set architecture version property -->
+      <condition property="version.arch" value="win32">
+         <isset property="is-windows"/>
+      </condition>
+   
+      <condition property="version.arch" value="unix">
+         <isset property="is-unix"/>
+      </condition>
+   
+      <condition property="version.arch" value="osx">
+         <isset property="is-osx"/>
+      </condition>
+      
+      <!-- set image module version property -->
+      <condition property="version.image.module" value="ImageMagick">
+         <isset property="is-imagemagick"/>
+      </condition>
+   
+      <condition property="version.image.module" value="DevIL">
+         <isset property="is-devil"/>
+      </condition>
    </target>
 
@@ -601 +656 @@
 
    <!-- dist target: build a binary distribution compressed with zip -->
-   <target name="dist" depends="samhaxe, doc" description="build binary distribution">
-      <delete includeemptydirs="true">
-         <fileset dir="${distdir}" includes="**/*"/>
-      </delete>
-
-      <property name="distdir.samhaxe" location="${distdir}/samhaxe-${version}"/>
+   <target name="dist" depends="samhaxe, doc, -version" description="build binary distribution">
+      <property name="samhaxe.binary" value="samhaxe-${version.name}-${version.revision}-${version.arch}-${version.image.module}"/>
+      <property name="distdir.samhaxe" location="${distdir}/${samhaxe.binary}"/>
 
       <mkdir dir="${distdir.samhaxe}"/>
@@ -621 +673 @@
          <fileset dir="${docdir}"/>
       </copy>
-      <zip basedir="${distdir}" destfile="${distdir}/samhaxe-${version}.zip"/>
+      <zip basedir="${distdir}" destfile="${distdir}/${samhaxe.binary}.zip" includes="${samhaxe.binary}/**"/>
 
       <delete dir="${distdir.samhaxe}"/>
    </target>
    
-   <target name="win32-installer" depends="samhaxe, doc" description="build win32 installer using NSIS (only under win32 with DevIL!)">
+   <!-- win32-installer target: build a win32 installer using NSIS -->
+   <target name="win32-installer" depends="samhaxe, doc, -version" description="build win32 installer using NSIS (only under win32 with DevIL!)">
       <fail unless="run.win32-installer" message="win32-installer target is vaild only under win32 with DevIL image module!"/>
       <exec executable="${nsis.path}/makensis" dir="${basedir}/win32">
+         <arg value="/DVERSION=${version.name}-${version.revision}"/>
          <arg value="SamHaXe.nsi"/>
       </exec>

trunk/win32/SamHaXe.nsi

@@ -1 @@
-!define SamhaxeVersion "v1.0-mojito"
 !define DevilVersion "1.7.8"
 !define FreeTypeVersion "2.3.5-1"
@@ -16 +15 @@
 
   Name "Sam HaXe"
-  OutFile "..\dist\samhaxe-${SamhaxeVersion}.exe"
+  OutFile "..\dist\samhaxe-${VERSION}.exe"
 
   ;Default installation folder
@@ -68 +67 @@
         FindNext $0 $1
     ${EndWhile}
-    End:
 FunctionEnd