Changeset 21630 for main/trunk/release-kits/shared

Timestamp:

2010-01-26T14:44:30+13:00 (14 years ago)

Author:

oranfry

Message:

tidy up for greenstone3, and made wrap shared

Location:

main/trunk/release-kits/shared

Files:

• core/ant-scripts/create-installer.xml (modified) (1 diff)
• core/ant-scripts/init.xml (modified) (2 diffs)
• core/ant-scripts/wrap.xml (added)
• greenstone2/ant-scripts/rk2-targets.xml (modified) (1 diff)
• greenstone2/wrapper (deleted)
• greenstone3/ant-scripts/rk3-targets.xml (modified) (5 diffs)
• greenstone3/wrapper (deleted)
• linux/wrapper.cpp (modified) (3 diffs)
• resources/artwork/splash.xcf (modified) ( previous)
• windows/wrapper/splash.bmp (added)

main/trunk/release-kits/shared/core/ant-scripts/create-installer.xml

@@ -2 +2 @@
 <project name="create-installer">
 
-    <target name="create-installer">
+    <target name="create-installer" depends="init,gs${version.major}-init">
 
         <!-- create installer directory -->

main/trunk/release-kits/shared/core/ant-scripts/init.xml

@@ -190 +190 @@
     </target>
 
+    <!-- show the core properties of all release-kits -->
+    <target name="core-properties">
+        <echo>Required Properties:</echo>
+        <echo>version             the version string for the release</echo>
+        <echo/>
+        <echo>Optional Properties:</echo>
+        <echo>branch.path         the branch of Greenstone to make a release of. Eg: tags/2.81. Default: trunk.</echo>
+        <echo>branch.revision     the revision of Greenstone to make a release of. Eg: 18273. Default: HEAD.</echo>
+        <echo/>
+    </target>
+
     <!-- a target to strip any directory of .svn folders -->
     <target name="strip-svn-dirs">
@@ -224 +235 @@
             manifest="${rk.home}/shared/core/uninstaller/manifest.mf"
             basedir="compiled/uninstaller/build" />
+
+        <!-- clean up build directory -->
+        <delete dir="compiled/uninstaller"/>
 
         <!-- put the associated script in place -->

main/trunk/release-kits/shared/greenstone2/ant-scripts/rk2-targets.xml

@@ -7 +7 @@
         ..........................................................
 -->
-
-<project name="rk2-targets">
-
-    <property name="version.major" value="2"/>
+<project name="greenstone2-targets">
 
     <target name="gs2-init">

main/trunk/release-kits/shared/greenstone3/ant-scripts/rk3-targets.xml

@@ -8 +8 @@
 -->
 
-<project name="rk3-targets">
-
-    <property name="version.major" value="3"/>
-
-    <!-- create the property set to be forwarded to greenstone3 -->
-    <propertyset id="forward.properties">
-        <propertyref prefix="forward."/>
-        <mapper type="glob" from="forward.*" to="*"/>
-        <propertyref name="app.version"/>
-        <propertyref name="branch.path"/>
-        <propertyref name="branch.revision"/>
-    </propertyset>
-
-    <target name="greenstone3-set-version-numbers">
-        <rsr
-            file="${greenstone3basedir}/resources/java/global.properties.in"
-            pattern="@gsdl3version@"
-            replacement="${version}" />
-        <rsr
-            file="${greenstone3basedir}/resources/java/server.properties"
-            pattern="^(Server3Control\.Version=).*$"
-            replacement="$1${version}" />
-
-    </target>
+<project name="greenstone3-targets">
 
     <target name="gs3-init">
@@ -50 +27 @@
     </target>
 
-    <target name="insert-uninstaller-jar">
-        <copy file="compiled/uninst.jar" tofile="distributions/web/uninst.jar"/>
+    <target name="greenstone3-set-version-numbers">
+        <rsr
+            file="${greenstone3basedir}/resources/java/global.properties.in"
+            pattern="@gsdl3version@"
+            replacement="${version}" />
+        <rsr
+            file="${greenstone3basedir}/resources/java/server.properties"
+            pattern="^(Server3Control\.Version=).*$"
+            replacement="$1${version}" />
+
     </target>
 
@@ -72 +57 @@
         <else><if><bool><or><equals arg1="${rk.os}" arg2="linux"/><equals arg1="${rk.os}" arg2="mac"/></or></bool>
             <exec executable="cp">
-                <arg    value="-r"/>
+                <arg value="-r"/>
                 <arg value="${rk.home}/core/ant"/>
                 <arg value="compiled/packages"/>
@@ -95 +80 @@
     </target>
 
-    <target name="checkout-greenstone3">
-        <svn>
-            <checkout url="${svn.root}/main/${branch.path}/greenstone3" destPath="compiled" revision="${branch.revision}"/>
-        </svn>
-    </target>
-
     <target name="export-greenstone3">
         <svn>
             <export srcUrl="${svn.root}/main/${branch.path}/greenstone3" destPath="${dest}" revision="${branch.revision}"/>
         </svn>
-    </target>
-
-    <target name="insert-xml-parser">
-        <copy todir="compiled/gs2build/perllib/cpan">
-            <fileset dir="${rk.home}/greenstone3" includes="XML-Parser/**/*"/>
-        </copy>
-    </target>
-
-    <target name="insert-documented-examples">
-        <echo>NOT IMPLEMENTED: Remember to put code in this target to grab and install the documented examples.</echo>
-        <!-- copy the doc eg colls from /home/nzdl - note we don't include the formatting ones -->
-    </target>
-
-    <target name="prepare-documentation">
-
-        <mkdir dir="compiled/gsdl-manuals"/>
-        <svn>
-            <checkout url="${svn.root}/documentation/${branch.path}/manuals" destPath="compiled/gsdl-manuals/manuals"/>
-            <checkout url="${svn.root}/documentation/${branch.path}/shared" destPath="compiled/gsdl-manuals/shared"/>
-        </svn>
-        <path id="documentation.compile.classpath">
-            <fileset dir="compiled/gsdl-manuals">
-                <include name="**/*.jar"/>
-            </fileset>
-            <pathelement path="compiled/gsdl-manuals/shared"/>
-            <pathelement path="compiled/gsdl-manuals/manuals"/>
-        </path>
-        <javac srcdir="compiled/gsdl-manuals/shared"
-            destdir="compiled/gsdl-manuals/shared"
-            debug="on"
-            classpathref="documentation.compile.classpath">
-            <include name="*.java"/>
-        </javac>
-        <unzip src="compiled/gsdl-manuals/shared/fop.zip" dest="compiled/gsdl-manuals/shared"/>
-
-        <java classname="ApplyXSLT" classpathref="documentation.compile.classpath" output="compiled/gsdl-manuals/manuals/xml-source/en/help-en.xml">
-            <arg value="compiled/gsdl-manuals/manuals/processing/gen-gli-help-to-manual-chapter.xsl" />
-            <arg value="compiled/gli/help/en/help.xml" />
-            <arg value="compiled" />
-        </java>
-
-        <chmod perm="a+x" file="compiled/gsdl-manuals/shared/fop/fop.sh"/>
-        <echo>Run generate-pdf script</echo>
-        <if><bool><equals arg1="${rk.os}" arg2="windows"/></bool>
-            <exec dir="compiled/gsdl-manuals/manuals" executable="cmd">
-                <arg value="/C" />
-                <arg file="${basedir}/compiled/gsdl-manuals/manuals/generate-pdf.bat" />
-                <arg value="u" />
-                <arg value="en" />
-            </exec>
-        <else>
-            <exec dir="compiled/gsdl-manuals/manuals" executable="/bin/bash">
-                <arg line="generate-pdf.sh u en" />
-            </exec>
-        </else></if>
     </target>
 
@@ -195 +119 @@
     </target>
 
-    <target name="clean-uninstaller">
-        <delete dir="distributions/web/uninstaller"/>
-    </target>
 
     <target name="insert-windows-icon">

main/trunk/release-kits/shared/linux/wrapper.cpp

@@ -96 +96 @@
     #ifndef CDROM
 
-    string jarfile = tempdir + "/@installer.name@.jar"; //where we will store the jar file
+    string jarfile = tempdir + "/greenstone.jar"; //where we will store the jar file
     string javafile = tempdir + "/@java.installer@"; //where we will store the java tar file
 
@@ -102 +102 @@
     //extract files
     cout << "Extracting installer jar..." << endl;
-    succeeded = extract_bundled_file( @installer.name@jar, sizeof(@installer.name@jar), (char*)jarfile.c_str(), false);
+    succeeded = extract_bundled_file( greenstonejar, sizeof(greenstonejar), (char*)jarfile.c_str(), false);
 
     #ifdef java_is_bundled
@@ -166 +166 @@
         cout << "Launching Installer ..." << endl;
         int launch_exit_code = 0;
-        launch_exit_code = system( (foundJvm.getExecutable() + " -Xmx85M -jar @installer.name@.jar" + (text_mode?" text":"") ).c_str() );
+        launch_exit_code = system( (foundJvm.getExecutable() + " -Xmx85M -jar greenstone.jar" + (text_mode?" text":"") ).c_str() );
 
         //report how it went