Changeset 15995 for release-kits/lirk3


Ignore:
Timestamp:
2008-06-13T14:23:32+12:00 (16 years ago)
Author:
oranfry
Message:

now using more shared stuff

Location:
release-kits/lirk3
Files:
1 deleted
2 edited

Legend:

Unmodified
Added
Removed

  • release-kits/lirk3/ant-scripts/create-installer.xml

    r15967 r15995  
    2929            <echo>Project Path: ${basedir}/distribution/greenstone3</echo>
    3030            <mkdir dir="${basedir}/installer"/>
    31             <copy todir="${basedir}/installer" file="${lirk3.home}/installer/antinstall-config.xml"/>
    32             <copy todir="${basedir}/installer" file="${lirk3.home}/installer/build.xml"/>
    33             <copy todir="${basedir}/installer/cp"><fileset dir="${lirk3.home}/installer/cp"/></copy>
     31            <copy todir="${basedir}/installer" file="${lirk3.home}/installer/antinstall-config.xml" overwrite="true" />
     32            <copy todir="${basedir}/installer" file="${lirk3.home}/installer/build.xml" overwrite="true" />
     33            <copy todir="${basedir}/installer/cp" overwrite="true"><fileset dir="${lirk3.home}/installer/cp"/></copy>
    3434
    3535            <!-- put the concrete values of things in the config -->
    … …  
    7171                    buildFile="${basedir}/installer/build.xml"
    7272                    antInstallLib="${lirk3.home}/bin/ant-installer/lib"
    73                     antLib="${lirk3.home}/bin/ant-installer/antlib"
     73                    antLib="${lirk3.home}/bin/apache-ant-1.6.5/lib"
    7474                    validateConfig="true"
    7575                    failOnError="false"
    … …  
    103103                    buildFile="${basedir}/installer/build.xml"
    104104                    antInstallLib="${lirk3.home}/bin/ant-installer/lib"
    105                     antLib="${lirk3.home}/bin/ant-installer/antlib"
     105                    antLib="${lirk3.home}/bin/apache-ant-1.6.5/lib"
    106106                    validateConfig="true"
    107107                    icons="bluecurve">

  • release-kits/lirk3/ant-scripts/wrap.xml

    r15205 r15995  
    1414        <addressedcall target="setup-for-wrapping"/>
    1515        <addressedcall target="compile-wrapper"/>
    16         <addressedcall target="clean-up-after-wrapping"/>
    1716    </target>
    1817
    … …  
    2322            <!-- create and setup the build directory -->
    2423            <mkdir dir="${basedir}/wrapped-installer/build"/>
    25             <copy todir="${basedir}/wrapped-installer/build" file="${lirk3.home}/wrapper/mywrapper.c"/>
     24            <copy todir="${basedir}/wrapped-installer/build" file="${lirk3.home}/linux/wrapper.cpp" overwrite="true" />
    2625
    2726            <!-- copy bundled files -->
    28             <copy todir="${basedir}/wrapped-installer/build" file="${lirk3.home}/search4j/search4j"/>
     27            <copy todir="${basedir}/wrapped-installer/build" file="${lirk3.home}/search4j/search4j" />
    2928            <copy todir="${basedir}/wrapped-installer/build" file="${lirk3.home}/wrapper/${java.installer}"/>
    3029            <copy todir="${basedir}/wrapped-installer/build" file="${basedir}/installer/greenstone3.jar"/>
    … …  
    3231
    3332            <!-- substitute the real java installer filename and min version into various files -->
    34             <rsr file="${basedir}/wrapped-installer/build/mywrapper.c" pattern="@java.installer@" replacement="${java.installer}"/>
    35             <rsr file="${basedir}/wrapped-installer/build/mywrapper.c" pattern="@java.extracted@" replacement="${java.extracted}"/>
    36             <rsr file="${basedir}/wrapped-installer/build/mywrapper.c" pattern="@java.min.version@" replacement="${java.min.version}"/>
     33            <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.installer@" replacement="${java.installer}"/>
     34            <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@installer.name@" replacement="greenstone3"/>
     35            <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.extracted@" replacement="${java.extracted}"/>
     36            <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.min.version@" replacement="${java.min.version}"/>
    3737
    3838        </if>
    … …  
    7575
    7676            <echo level="info">creating the header file for no java version</echo>
    77             <delete file="mywrapper.h"/>
    78             <exec executable="echo" output="${basedir}/wrapped-installer/build/mywrapper.h"><arg line="extern const char greenstone3jar[${greenstone3.jar.size}];"/></exec>
    79             <exec executable="echo" output="${basedir}/wrapped-installer/build/mywrapper.h" append="true"><arg line="extern const char search4j[${search4j.size}];"/></exec>
     77            <delete file="wrapper.h"/>
     78            <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h"><arg line="extern const char greenstone3jar[${greenstone3.jar.size}];"/></exec>
     79            <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h" append="true"><arg line="extern const char search4j[${search4j.size}];"/></exec>
    8080
    8181            <echo level="info">compile the wrapper program</echo>
    8282            <exec executable="g++" dir="${basedir}/wrapped-installer/build">
    83                 <arg line="-Wall -static -static-libgcc -c -o mywrapper.o mywrapper.c"/>
     83                <arg line="-Wall -static -static-libgcc -c -o wrapper.o wrapper.cpp"/>
    8484            </exec>
    8585
    8686            <echo level="info">link, bundling the files to be bundled</echo>
    8787            <exec executable="g++" dir="${basedir}/wrapped-installer/build">
    88                 <arg line="-static -static-libgcc -o  ../greenstone-${version}-linux.bin mywrapper.o greenstone3.jar.o search4j.o"/>
     88                <arg line="-static -static-libgcc -o  ../greenstone-${version}-linux.bin wrapper.o greenstone3.jar.o search4j.o"/>
    8989            </exec>
    9090
    9191
    9292            <echo level="info">creating the header file for bundled java version</echo>
    93             <delete file="mywrapper.h"/>
    94             <exec executable="echo" output="${basedir}/wrapped-installer/build/mywrapper.h"><arg line="extern const char greenstone3jar[${greenstone3-with-java.jar.size}];"/></exec>
    95             <exec executable="echo" output="${basedir}/wrapped-installer/build/mywrapper.h" append="true"><arg line="extern const char search4j[${search4j.size}];"/></exec>
    96             <exec executable="echo" output="${basedir}/wrapped-installer/build/mywrapper.h" append="true"><arg line="extern const char java[${java.size}];"/></exec>
    97             <exec executable="echo" output="${basedir}/wrapped-installer/build/mywrapper.h" append="true"><arg line="#define java_is_bundled yes"/></exec>
     93            <delete file="wrapper.h"/>
     94            <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h"><arg line="extern const char greenstone3jar[${greenstone3-with-java.jar.size}];"/></exec>
     95            <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h" append="true"><arg line="extern const char search4j[${search4j.size}];"/></exec>
     96            <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h" append="true"><arg line="extern const char java[${java.size}];"/></exec>
     97            <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h" append="true"><arg line="#define java_is_bundled yes"/></exec>
    9898
    9999            <echo level="info">recompile the wrapper program</echo>
    100100            <exec executable="g++" dir="${basedir}/wrapped-installer/build">
    101                 <arg line="-Wall -static -static-libgcc -c -o mywrapper.o mywrapper.c"/>
     101                <arg line="-Wall -static -static-libgcc -c -o wrapper.o wrapper.cpp"/>
    102102            </exec>
    103103
    104104            <echo level="info">relink, bundling the files to be bundled</echo>
    105105            <exec executable="g++" dir="${basedir}/wrapped-installer/build">
    106                 <arg line="-static -static-libgcc -o  ../greenstone-${version}-linux-with-java.bin mywrapper.o greenstone3-with-java.jar.o search4j.o java.o"/>
     106                <arg line="-static -static-libgcc -o  ../greenstone-${version}-linux-with-java.bin wrapper.o greenstone3-with-java.jar.o search4j.o java.o"/>
    107107            </exec>
    108 
    109 
    110108
    111109        </if>
    112110    </target>
    113111
    114     <target name="clean-up-after-wrapping">
    115         <if><bool><istrue value="${execute}"/></bool>
    116             <delete dir="${basedir}/wrapped-installer/build"/>
    117         </if>
    118     </target>
    119 
    120 
    121 
    122112</project>
Note: See TracChangeset for help on using the changeset viewer.