Changeset 20209


Ignore:
Timestamp:
2009-08-11T12:28:31+12:00 (13 years ago)
Author:
oranfry
Message:

removed all cp.jar files and put in code to create them during compilation

Location:
greenstone3/trunk
Files:
4 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • greenstone3/trunk/build.xml

    r20208 r20209  
    371371   
    372372
    373   <target name="install-runtime" depends="init,configure,configure-packages,configure-core,compile-web,compile-packages,compile-core"
     373  <target name="install-runtime" depends="init,configure,configure-packages,configure-core,compile-web,compile-packages,compile-core,compile-classpath-jars"
    374374    description="Install (configure, compile, install) the runtime system. Needs either common-src or collection-building to have been installed first." />
    375375   
     
    380380    description="Configure the installation (not the C++ code). Includes setting up config files. Should be re-run if you change the build.properties file."/>
    381381
    382   <target name="clean" depends="init,clean-packages,clean-core,clean-common-src,clean-collection-building"
     382  <target name="clean" depends="init,clean-packages,clean-core,clean-common-src,clean-collection-building,clean-classpath-jars"
    383383    description="Remove all old compiled code. Includes runtime and collection-building if necessary"/>
    384384 
    385   <target name="distclean" depends="init,distclean-packages,clean-core,distclean-common-src,distclean-collection-building"
     385  <target name="distclean" depends="init,distclean-packages,clean-core,distclean-common-src,distclean-collection-building,clean-classpath-jars"
    386386    description="Remove all compiled code and also any Makefiles etc generated during configure-c++. Includes runtime and collection-building as necessary"/>
    387387 
     
    637637    </javac>
    638638  </target>
     639
     640  <target name="compile-classpath-jars" depends="init">
     641    <if><bool><available file="admin/cp.mf"/></bool>
     642      <jar destfile="admin/cp.jar" manifest="admin/cp.mf"/>
     643    </if>
     644    <if><bool><available file="${lib.java}/cp.mf"/></bool>
     645      <jar destfile="${lib.java}/cp.jar" manifest="${lib.java}/cp.mf"/>
     646    </if>
     647    <if><bool><available file="${lib.jni}/cp.mf"/></bool>
     648      <jar destfile="${lib.jni}/cp.jar" manifest="${lib.jni}/cp.mf"/>
     649    </if>
     650    <if><bool><available file="${web.lib}/cp.mf"/></bool>
     651      <jar destfile="${web.lib}/cp.jar" manifest="${web.lib}/cp.mf"/>
     652    </if>
     653    <jar destfile="cp.jar">
     654      <manifest>
     655        <attribute name="Class-Path" value="admin/cp.jar lib/java/cp.jar lib/jni/cp.jar web/WEB-INF/lib/cp.jar"/>
     656      </manifest>
     657    </jar>
     658  </target>
     659
     660  <target name="clean-classpath-jars" depends="init">
     661    <delete file="admin/cp.jar"/>
     662    <delete file="${lib.java}/cp.jar"/>
     663    <delete file="${lib.jni}/cp.jar"/>
     664    <delete file="${web.lib}/cp.jar"/>
     665    <delete file="cp.jar"/>
     666  </target>
     667
    639668
    640669  <target name="svnupdate-web" unless="nosvn.mode">
     
    933962    <input addproperty="axis.undeploy.servicename" defaultvalue="localsite">Please enter the full name of the service you wish to undeploy.
    934963To find out which web services you've got deployed, point your browser to http://HOST:PORT/greenstone3/services
    935 Or press Enter for undeploying the default:localsite /></input>
     964Or press Enter for undeploying the default:localsite /&gt;</input>
    936965     <echo>Name of service to undeploy: ${axis.undeploy.servicename}</echo>
    937966  </target>
     
    940969    <input addproperty="axis.servicesname" defaultvalue="${base.webservice.name}">Which set of web services do you want to deploy?
    941970Choose from: ${web.services.list}
    942 Or press Enter for default:${base.webservice.name} /></input>
     971Or press Enter for default:${base.webservice.name} /&gt;</input>
    943972    <echo>${axis.servicesname}</echo>
    944973  </target>
  • greenstone3/trunk/lib/java/cp.mf

    r18122 r20209  
    1 Class-Path: AntelopeTasks_3.4.2.jar anttasks.jar ganymed.jar svnant.jar svnClientAdapter.jar svnjavahl.jar svnkit.jar Java_svn.jar
     1Class-Path: AntelopeTasks_3.4.2.jar anttasks.jar ganymed.jar svnant.jar
     2 svnClientAdapter.jar svnjavahl.jar svnkit.jar Java_svn.jar
Note: See TracChangeset for help on using the changeset viewer.