Changeset 16197

Timestamp:

2008-06-26T11:49:16+12:00 (16 years ago)

Author:

oranfry

Message:

getting wirk2 into shape

Location:

release-kits

Files:

• shared/greenstone2/icon (added)
• shared/greenstone2/icon/gs2-16.xcf (added)
• shared/greenstone2/icon/gs2.ico (added)
• shared/greenstone2/icon/gs2.xcf (added)
• shared/greenstone2/wrapper (added)
• shared/greenstone2/wrapper/splash.bmp (added)
• shared/greenstone2/wrapper/splash.xcf (added)
• wirk2/ant-scripts/wrap.xml (modified) (3 diffs)

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

@@ -44 +44 @@
                     <not>
                         <uptodate targetfile="${basedir}/wrapped-installer/build/wrapper.RES">
-                            <srcfiles dir="${wirk3.home}/icon" includes="gs3.ico"/>
-                            <srcfiles dir="${wirk3.home}/wrapper" includes="${windows-java.installer}"/>
-                            <srcfiles dir="${wirk3.home}/wrapper" includes="*.bmp"/>
-                            <srcfiles dir="${wirk3.home}/wrapper" includes="*.rc"/>
-                            <srcfiles dir="${basedir}/installer" includes="greenstone3.jar"/>
+                            <srcfiles dir="${wirk2.home}/greenstone2/icon" includes="gs2.ico"/>
+                            <srcfiles dir="${wirk2.home}/windows/wrapper" includes="${windows-java.installer}"/>
+                            <srcfiles dir="${wirk2.home}/windows/wrapper" includes="*.bmp"/>
+                            <srcfiles dir="${wirk2.home}/greenstone2/wrapper" includes="*.bmp"/>
+                            <srcfiles dir="${wirk2.home}/windows/wrapper" includes="*.rc"/>
+                            <srcfiles dir="${basedir}/installer" includes="greenstone2.jar"/>
                         </uptodate>
                     </not>
@@ -56 +57 @@
                 
                 <echo>getting the template resource script</echo>
-                <copy todir="${basedir}/wrapped-installer/build" file="${wirk3.home}/wrapper/wrapper.rc" overwrite="true"/>
+                <copy todir="${basedir}/wrapped-installer/build" file="${wirk2.home}/wrapper/wrapper.rc" overwrite="true"/>
                 
                 <echo>copying the small resource files into place</echo>
                 <copy todir="${basedir}/wrapped-installer/build">
-                    <fileset dir="${wirk3.home}/wrapper" includes="*.bmp"/>
-                    <fileset dir="${wirk3.home}/icon" includes="gs3.ico"/>
+                    <fileset dir="${wirk2.home}/windows/wrapper" includes="*.bmp"/>
+                    <fileset dir="${wirk2.home}/greenstone2/wrapper" includes="*.bmp"/>
+                    <fileset dir="${wirk2.home}/greenstone2/icon" includes="gs2.ico"/>
                 </copy>
                 
-                <echo>adding greenstone3.jar to the resource script as chunks</echo>
+                <echo>adding greenstone2.jar to the resource script as chunks</echo>
                 <rsplit
                     resource="${basedir}/installer/greenstone-${version}-win32.jar"
@@ -84 +86 @@
                 <echo>adding ${windows-java.installer} to the copy as chunks</echo>
                 <rsplit
-                    resource="${wirk3.home}/wrapper/${windows-java.installer}"
+                    resource="${wirk2.home}/windows/wrapper/${windows-java.installer}"
                     outputDir="${basedir}/wrapped-installer/build"                  
                     resourceScript="${basedir}/wrapped-installer/build/wrapper-with-jre.rc"