Changeset 16198

Timestamp:

2008-06-26 11:54:45 (3 months ago)

Author:

oranfry

Message:

made wirk3 work with the new shared code scheme

Files:

• release-kits/wirk3/ant-scripts/build.xml (modified) (1 diff)
• release-kits/wirk3/ant-scripts/compile.xml (modified) (2 diffs)
• release-kits/wirk3/ant-scripts/create-distribution.xml (modified) (2 diffs)
• release-kits/wirk3/ant-scripts/create-installer.xml (modified) (5 diffs)
• release-kits/wirk3/ant-scripts/create-launcher.xml (deleted)
• release-kits/wirk3/ant-scripts/init.xml (deleted)
• release-kits/wirk3/ant-scripts/operations-on-gs3home.xml (modified) (1 diff)
• release-kits/wirk3/ant-scripts/wrap.xml (modified) (6 diffs)
• release-kits/wirk3/installer/antinstall-config.xml (modified) (1 diff)
• release-kits/wirk3/src/make.bat (moved) (moved from release-kits/wirk3/bin/make.bat) (1 diff)
• release-kits/wirk3/src/wirk3.cpp (modified) (1 diff)

release-kits/wirk3/ant-scripts/build.xml

@@ -1 +1 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
-<!--
-                .......................................................... 
-September 2007
-Greenstone3 'release maker' script
+February 2008
+Windows Release Kit for greenstone3
-                Oran Fry
-                ..........................................................
--->
-
-<project name="wirk3-build" default="wirk3">
-
-import file="init.xml"/
+!-- CONSTANTS --
-        
+        <!-- the size of the resourse chunks to be put in the wrapped installer -->
+        <property name="resources.chunksize" value="8388608"/><!-- 8MiB -->
+
+        <!-- the version numbers of bundled things -->
+        <property name="bundled.version.tomcat" value="5.5.25"/>
+        <property name="bundled.version.ant" value="1.6.5"/>
+
+        <!-- for the benefit of the shared scripts, set release-kit home -->
+        <property name="rk.home" value="${wirk3.home}" />
+
+        <!-- IMPORT OTHER ANT SCRIPTS -->
+        <import file="shared-ant-scripts/init.xml"/>
-        <import file="compile.xml"/>
-        <import file="create-distribution.xml"/>
-        <import file="create-installer.xml"/>
-        <import file="wrap.xml"/>
-
+
+
-        <target name="wirk3" depends="init">
-                <echo>Local Basedir: ${basedir.local}</echo>
-                
-                <addressedcall target="compile"/>
-                <addressedcall target="create-distribution"/>

release-kits/wirk3/ant-scripts/compile.xml

@@ -1 +1 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
-<!--
-                .......................................................... 
-                September 2007
-                Greenstone3 'release maker' script
-                Oran Fry
-                ..........................................................
--->
-
-<project name="wirk3-compile" default="compile">
-
-
-        <target name="compile">
-
-                <addressedcall target="checkout-greenstone3" />
-                <addressedcall target="set-version-number-property" />
@@ -19 +8 @@
-                <addressedcall target="dist-build-windows" />
-                <addressedcall target="prepare-documentation" />
-
-        </target>
-
-
-        <!--
-
-                second level targets
-
-        -->
-
-        <target name="checkout-greenstone3">

release-kits/wirk3/ant-scripts/create-distribution.xml

@@ -1 +1 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
-<!--
-                .......................................................... 
-                September 2007
-                Greenstone3 'release maker' script
-                Oran Fry
-                ..........................................................
--->
-
-<project name="wirk3-create-distribution" default="create-distribution">
-
@@ -25 +16 @@
-        </target>
-
-
-
-        <!--
-
-                second level targets
-
-        -->
-        
-        <target name="export-greenstone3">
-                <if><bool><istrue value="${execute}"/></bool>

release-kits/wirk3/ant-scripts/create-installer.xml

@@ -1 +1 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
-<!--
-                .......................................................... 
-                September 2007
-                Greenstone3 'release maker' script
-                Oran Fry
-                ..........................................................
--->
-
-<project name="wirk3-create-installer" default="create-installer">
-
@@ -19 +10 @@
-                <if><bool><istrue value="${execute}"/></bool>
-                        
-
+/resources
-                        <copy todir="${basedir}/installer" file="${wirk3.home}/installer/antinstall-config.xml"/>
-                        <copy todir="${basedir}/installer" file="${wirk3.home}/installer/build.xml"/>
-resourc
-installer/resources-window
-installer/resources-greenstone3
+class
+windows/installer-classe
+greenstone3/installer-classes
-                        </copy>
-                        
@@ -33 +24 @@
-                        <!-- put the concrete values of things in the text -->
-                        <!-- default -->
-
-
-resources/LanguagePack.properties" pattern="@bundled.version.java@" replacement="${bundled.version.
-
-
+classes/
+classes/
+classes/resources/LanguagePack.properties" pattern="@bundled.version.java@" replacement="${bundled.version.windows-
+classes/
+classes/
-                        
-                        <!-- chinese -->
-
-
-resources/LanguagePack_zh_CN.properties" pattern="@bundled.version.java@" replacement="${bundled.version.
-
-
+classes/
+classes/
+classes/resources/LanguagePack_zh_CN.properties" pattern="@bundled.version.java@" replacement="${bundled.version.windows-
+classes/
+classes/
-                        
-                        
@@ -58 +49 @@
-                                        installConfig="${basedir}/installer/antinstall-config.xml"
-                                        buildFile="${basedir}/installer/build.xml"
-bin
-bin/ant-installer/ant
+packages
+packages/ant/
-                                        validateConfig="true"
-                                        icons="bluecurve">
-
-resources" prefix="resourc
+class
-                                <zipfileset dir="${wirk3.home}/ant-scripts/tasks/orans"><include name="RegexSearchReplace.class"/></zipfileset>
-
@@ -77 +68 @@
-                                <zipfileset dir="${basedir}/distribution/greenstone3/winutil" prefix="winutil"><include name="**/*"/></zipfileset>
-                                <zipfileset dir="${basedir}/distribution/greenstone3/src" prefix="src"><include name="**/*"/></zipfileset>
-
+
-                        </installer>
-
-                        
-                </if>

release-kits/wirk3/ant-scripts/operations-on-gs3home.xml

@@ -148 +148 @@
-  
-        <target name="run-xslt-binary" depends="init">
-
+greenstone3/
-        </target>
-  

release-kits/wirk3/ant-scripts/wrap.xml

@@ -1 +1 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
-<!--
-                .......................................................... 
-                September 2007
-                Greenstone3 'release maker' script
-                Oran Fry
-                ..........................................................
--->
-
-<project name="wirk3-wrap" default="wrap">
-
@@ -27 +18 @@
-
-                        <!-- copy source files -->
-
-
-
+indows/w
+packages/
+packages/
-                
-                </if>
@@ -39 +30 @@
-                        <!-- substitute the real java installer filename and min version into various files -->
-                        <echo>Substitute concrete values of things into source files</echo>
-                        <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.installer@" replacement="${java.installer}"/>
-                        <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.min.version@" replacement="${java.min.version}"/>
-
+
+
-                        
-                </if>
@@ -53 +44 @@
-                                        <not>
-                                                <uptodate targetfile="${basedir}/wrapped-installer/build/wrapper.RES">
-
-
-
-
+
+
+
+
+
-                                                        <srcfiles dir="${basedir}/installer" includes="greenstone3.jar"/>
-                                                </uptodate>
@@ -65 +57 @@
-                                
-                                <echo>getting the template resource script</echo>
-
+indows/w
-                                
-                                <echo>copying the small resource files into place</echo>
-                                <copy todir="${basedir}/wrapped-installer/build">
-
-
+
+
+
-                                </copy>
-                                
@@ -91 +84 @@
-                                <copy file="${basedir}/wrapped-installer/build/wrapper.rc" tofile="${basedir}/wrapped-installer/build/wrapper-with-jre.rc"/>
-                                
-
+windows-
-                                <rsplit
-rapper/${
+indows/wrapper/${windows-
-                                        outputDir="${basedir}/wrapped-installer/build"                                  
-                                        resourceScript="${basedir}/wrapped-installer/build/wrapper-with-jre.rc"

release-kits/wirk3/installer/antinstall-config.xml

@@ -7 +7 @@
-                        debug="false"
-                        lookAndFeel="org.tp23.jgoodies.plaf.plastic.PlasticXPLookAndFeel"
-3 
+
-                        windowIcon="/resources/icon.png"
-                        defaultImageResource="/resources/header.png"

release-kits/wirk3/src/make.bat

@@ -1 @@
-..\src\wirk3.cpp -o 
+wirk3.cpp -o ..\bin\
-del wirk3.obj

release-kits/wirk3/src/wirk3.cpp

@@ -37 +37 @@
-        
-        //set the classpath
-
-
+
-        putenv( ("CLASSPATH=" + classpath).c_str() );
-
-        //check that it worked
-        //string changed_classpath = getenv("CLASSPATH");
-        //cout << "classpath: " << changed_classpath << endl;
-        
-        //create the command
-bin\\apache-ant-1.6.5
+packages\\ant
-        //pass on the arguments
-        string a;