Changeset 16633

Show
Ignore:
Timestamp:
01.08.2008 15:42:20 (11 years ago)
Author:
oranfry
Message:

changes afer splitting gsdl into common, build and runtime

Location:
release-kits/wirk2
Files:
6 modified

Legend:

Unmodified
Added
Removed
  • release-kits/wirk2/ant-scripts/compile.xml

    r16458 r16633  
    2525    <target name="set-version-numbers"> 
    2626        <if><bool><istrue value="${execute}"/></bool> 
    27             <rsr file="${basedir}/gsdl/src/lib/gsdlconf.h" pattern="(#define GSDL_VERSION ).*" replacement="$1&quot;${version}&quot;" /> 
     27            <rsr file="${basedir}/gsdl/common-src/src/lib/gsdlconf.h" pattern="(#define GSDL_VERSION ).*" replacement="$1&quot;${version}&quot;" /> 
    2828            <rsr file="${basedir}/gsdl/Install.sh" pattern="(echo &quot;Version: ).*(&quot; .*)" replacement="$1${version}$2" /> 
    2929            <rsr file="${basedir}/gsdl/etc/VERSION" pattern="(gsdl version: ).*" replacement="$1${version}" /> 
     
    3333    <target name="unzip-packages"> 
    3434        <if><bool><istrue value="${execute}"/></bool> 
    35             <unzip src="${basedir}/gsdl/packages/windows/crypt/crypt.zip" dest="${basedir}/gsdl/packages/windows/crypt"/> 
    36             <unzip src="${basedir}/gsdl/packages/windows/expat/expat.zip" dest="${basedir}/gsdl/packages/windows/expat"/> 
    37             <unzip src="${basedir}/gsdl/packages/windows/gdbm/gdbm.zip" dest="${basedir}/gsdl/packages/windows/gdbm"/> 
    38             <unzip src="${basedir}/gsdl/packages/windows/stlport/stlport.zip" dest="${basedir}/gsdl/packages/windows/stlport"/> 
     35            <unzip src="${basedir}/gsdl/common-src/packages/windows/crypt/crypt.zip" dest="${basedir}/gsdl/common-src/packages/windows/crypt"/> 
     36            <unzip src="${basedir}/gsdl/common-src/packages/windows/expat/expat.zip" dest="${basedir}/gsdl/common-src/packages/windows/expat"/> 
     37            <unzip src="${basedir}/gsdl/common-src/packages/windows/gdbm/gdbm.zip" dest="${basedir}/gsdl/common-src/packages/windows/gdbm"/> 
     38            <unzip src="${basedir}/gsdl/common-src/packages/windows/stlport/stlport.zip" dest="${basedir}/gsdl/common-src/packages/windows/stlport"/> 
    3939        </if>    
    4040    </target> 
  • release-kits/wirk2/ant-scripts/create-distribution.xml

    r16458 r16633  
    3030             
    3131            <echo level="info">Setting version in src/lib/gsdlconf.h</echo> 
    32             <rsr file="${basedir}/distributions/web/src/lib/gsdlconf.h" pattern="(#define GSDL_VERSION) &quot;.*&quot;" replacement="$1 &quot;${version}&quot;" /> 
     32            <rsr file="${basedir}/distributions/web/common-src/src/lib/gsdlconf.h" pattern="(#define GSDL_VERSION) &quot;.*&quot;" replacement="$1 &quot;${version}&quot;" /> 
    3333             
    3434            <echo level="info">Setting version in etc/VERSION</echo> 
  • release-kits/wirk2/ant-scripts/create-installer.xml

    r16280 r16633  
    1111             
    1212            <mkdir dir="${basedir}/installer/classes"/> 
    13             <copy todir="${basedir}/installer" file="${wirk2.home}/installer/antinstall-config.xml"/> 
    14             <copy todir="${basedir}/installer" file="${wirk2.home}/installer/build.xml"/> 
    15             <copy todir="${basedir}/installer/classes"> 
     13            <copy todir="${basedir}/installer" file="${wirk2.home}/installer/antinstall-config.xml" overwrite="true"/> 
     14            <copy todir="${basedir}/installer" file="${wirk2.home}/installer/build.xml" overwrite="true"/> 
     15            <copy todir="${basedir}/installer/classes" overwrite="true"> 
    1616                <fileset dir="${wirk2.home}/greenstone2/installer-classes"/> 
    1717                <fileset dir="${wirk2.home}/windows/installer-classes"/> 
  • release-kits/wirk2/ant-scripts/wrap.xml

    r16204 r16633  
    1818             
    1919            <!-- copy source files --> 
    20             <copy todir="${basedir}/wrapped-installer/build" file="${wirk2.home}/windows/wrapper/wrapper.cpp"/> 
    21             <copy todir="${basedir}/wrapped-installer/build" file="${wirk2.home}/packages/search4j/libsearch4j.cpp"/> 
    22             <copy todir="${basedir}/wrapped-installer/build" file="${wirk2.home}/packages/search4j/libsearch4j.h"/> 
     20            <copy todir="${basedir}/wrapped-installer/build" file="${wirk2.home}/windows/wrapper/wrapper.cpp"  overwrite="true"/> 
     21            <copy todir="${basedir}/wrapped-installer/build" file="${wirk2.home}/packages/search4j/libsearch4j.cpp" overwrite="true"/> 
     22            <copy todir="${basedir}/wrapped-installer/build" file="${wirk2.home}/packages/search4j/libsearch4j.h" overwrite="true"/> 
    2323         
    2424        </if> 
     
    6060                 
    6161                <echo>copying the small resource files into place</echo> 
    62                 <copy todir="${basedir}/wrapped-installer/build"> 
     62                <copy todir="${basedir}/wrapped-installer/build" overwrite="true"> 
    6363                    <fileset dir="${wirk2.home}/windows/wrapper" includes="*.bmp"/> 
    6464                    <fileset dir="${wirk2.home}/greenstone2/wrapper" includes="*.bmp"/> 
     
    8282                 
    8383                <echo>making a copy of the resource script</echo> 
    84                 <copy file="${basedir}/wrapped-installer/build/wrapper.rc" tofile="${basedir}/wrapped-installer/build/wrapper-with-jre.rc"/> 
     84                <copy file="${basedir}/wrapped-installer/build/wrapper.rc" tofile="${basedir}/wrapped-installer/build/wrapper-with-jre.rc" overwrite="true"/> 
    8585                 
    8686                <echo>adding ${windows-java.installer} to the copy as chunks</echo> 
  • release-kits/wirk2/installer/antinstall-config.xml

    r16087 r16633  
    3737        <target target="install-core-components"    defaultValue="true" force="true" displayText="" /> 
    3838        <target target="install-source-code"        defaultValue="false" displayText="" /> 
     39        <target target="install-start-menu-shortcuts"   defaultValue="true" displayText="" /> 
    3940 
    4041    </page> 
  • release-kits/wirk2/installer/build.xml

    r16244 r16633  
    1515    <!-- custom tasks --> 
    1616    <typedef name="rsr" classname="RegexSearchReplace" classpathref="project.classpath"/> 
     17    <taskdef name="shortcut" classname="com.orangevolt.tools.ant.Win32ShortcutTask" classpathref="project.classpath"/>  
     18    <taskdef name="winprops" classname="com.orangevolt.tools.ant.Win32PropertiesTask" classpathref="project.classpath"/>  
    1719 
    1820    <condition property="bundled.java.exists"> 
     
    2022    </condition> 
    2123 
     24    <!-- load windows properties --> 
     25    <winprops/> 
    2226 
    2327    <target name="install-core-components" depends=""> 
     
    3034        <echo message="Creating Installation directory"/> 
    3135        <mkdir dir="${installDir}"/> 
    32  
    33  
     36         
     37         
    3438        <!-- install files --> 
    3539        <echo message="Installing GLI (gli)"/> 
    3640        <unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="gli/**/*"/></patternset></unzip> 
    3741        <echo/> 
    38  
     42         
    3943        <echo message="Installing Executable Binaries (bin)"/> 
    4044        <unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="bin/**/*"/></patternset></unzip> 
    4145        <echo/> 
    42  
     46         
    4347        <echo message="Installing CGI Binaries (cgi-bin)"/> 
    4448        <unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="cgi-bin/**/*"/></patternset></unzip> 
    4549        <echo/> 
    46  
     50         
    4751        <echo message="Installing Config Folder (etc)"/> 
    4852        <unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="etc/**/*"/></patternset></unzip> 
    4953        <echo/> 
    50  
     54         
    5155        <echo message="Installing mappings (mappings)"/> 
    5256        <unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="mappings/**/*"/></patternset></unzip> 
    5357        <echo/> 
    54  
    55         <echo message="Installing Packages (packages)"/> 
    56         <unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="packages/**/*"/></patternset></unzip> 
    57         <echo/> 
    58  
     58         
     59         
    5960        <echo message="Installing Images (images)"/> 
    6061        <unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="images/**/*"/></patternset></unzip> 
    6162        <echo/> 
    62  
     63         
    6364        <echo message="Installing Perl Libraries (perllib)"/> 
    6465        <unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="perllib/**/*"/></patternset></unzip> 
    6566        <echo/> 
    66  
     67         
    6768        <echo message="Installing Indexers (indexers)"/> 
    6869        <unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="indexers/**/*"/></patternset></unzip> 
    6970        <echo/> 
    70  
     71         
    7172        <echo message="Installing Macros (macros)"/> 
    7273        <unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="macros/**/*"/></patternset></unzip> 
    7374        <echo/> 
    74  
     75         
    7576        <echo message="Installing Collect Folder (collect)"/> 
    7677        <unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="collect/**/*"/></patternset></unzip> 
     
    9192        </unzip> 
    9293        <echo/> 
    93  
     94         
    9495        <!-- delete unneeded files -->       
    9596        <echo message="Deleting some extraneous files"/> 
    9697        <delete dir="${installDir}/resources/icons"/> 
    9798        <delete file="${installDir}/resources/*.png"/> 
    98  
     99         
    99100        <echo message="Finished"/> 
    100  
     101         
    101102    </target> 
    102103 
    103104    <!-- Source --> 
    104105    <target name="install-source-code" depends=""> 
    105         <echo message="Installing Source Code (src)"/> 
     106 
     107    <echo message="Installing Source Code (src)"/> 
     108        <echo message="Installing Packages (packages)"/> 
     109        <unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="packages/**/*"/></patternset></unzip> 
     110        <echo/> 
     111         
    106112        <mkdir dir="${installDir}/src"/> 
    107113        <unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="src/**/*"/></patternset></unzip> 
     114         
     115    </target> 
     116     
     117    <!-- Start menu shortcuts --> 
     118    <target name="install-start-menu-shortcuts"> 
     119 
     120        <mkdir dir="${win32.personal.programs_menu}\Greenstone-@version@\Documentation"/> 
     121         
     122        <shortcut 
     123            file="${win32.personal.programs_menu}\Greenstone-@version@\Greenstone2 Server.lnk" 
     124            execute="${installDir}\bin\windows\server.exe" 
     125            workingDirectory="${installDir}" 
     126            iconFile="${installDir}\images\icon.ico" 
     127            iconIndex="0" /> 
     128 
     129        <shortcut 
     130            file="${win32.personal.programs_menu}\Greenstone-@version@\Greenstone Librarian Interface (GLI).lnk" 
     131            execute="${installDir}\gli\gli.bat" 
     132            workingDirectory="${installDir}\gli" 
     133            iconFile="${installDir}\images\icon.ico" 
     134            iconIndex="0" /> 
     135             
     136        <shortcut 
     137            file="${win32.personal.programs_menu}\Greenstone-@version@\Greenstone Editor for Metadata Sets (GEMS).lnk" 
     138            execute="${installDir}\gli\gems4gs3.bat" 
     139            workingDirectory="${installDir}\gli" 
     140            iconFile="${installDir}\images\icon.ico" 
     141            iconIndex="0" /> 
     142         
     143        <shortcut 
     144            file="${win32.personal.programs_menu}\Greenstone-@version@\Documentation\READMEen.lnk" 
     145            execute="${installDir}\READMEen.txt" /> 
     146        <shortcut 
     147            file="${win32.personal.programs_menu}\Greenstone-@version@\Documentation\READMEes.lnk" 
     148            execute="${installDir}\READMEes.txt" /> 
     149        <shortcut 
     150            file="${win32.personal.programs_menu}\Greenstone-@version@\Documentation\READMEar.lnk" 
     151            execute="${installDir}\READMEar.txt" /> 
     152        <shortcut 
     153            file="${win32.personal.programs_menu}\Greenstone-@version@\Documentation\READMEfr.lnk" 
     154            execute="${installDir}\READMEfr.txt" /> 
     155        <shortcut 
     156            file="${win32.personal.programs_menu}\Greenstone-@version@\Documentation\READMEru.lnk" 
     157            execute="${installDir}\READMEru.txt" /> 
    108158    </target> 
    109159 
    110     <target name="cleanuptarget"> 
    111     </target> 
     160 
     161    <target name="cleanuptarget"></target> 
    112162     
    113163