Changeset 527
- Timestamp:
- 11/25/13 09:54:36 (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/build.xml
r510 r527 17 17 <property name="build.dir.exp" location="bin" /> 18 18 <property name="build.dir.6.exp" location="bin-1.6" /> 19 <property name="manifest.path.exp" value="makeFiles/Manifest.txt" /> 20 <property name="lib.dir.exp" location="releases/jars" /> 19 21 20 <union id=" dist.includes.exp">22 <union id="portable.includes.exp"> 21 23 <zipfileset excludes="META-INF/*.SF" src="releases/jars/junit.jar"/> 22 24 <zipfileset excludes="META-INF/*.SF" src="releases/jars/activation.jar"/> … … 35 37 </union> 36 38 39 <path id="classpath.exp"> 40 <fileset dir="${lib.dir.exp}"> 41 <include name="*.jar" /> 42 </fileset> 43 </path> 37 44 38 <path id="Expeditee.classpath">39 <pathelement location="releases/jars/junit.jar"/>40 <pathelement location="releases/jars/activation.jar"/>41 <pathelement location="releases/jars/cobra.jar"/>42 <pathelement location="releases/jars/iText-2.1.3.jar"/>43 <pathelement location="releases/jars/jcommon-1.0.13.jar"/>44 <pathelement location="releases/jars/JEP.jar"/>45 <pathelement location="releases/jars/JFreeCharts.jar"/>46 <pathelement location="releases/jars/js.jar"/>47 <pathelement location="releases/jars/lobo.jar"/>48 <pathelement location="releases/jars/lobo-pub.jar"/>49 <pathelement location="releases/jars/mail.jar"/>50 <pathelement location="releases/jars/xercesImpl.jar"/>51 <pathelement location="releases/jars/jazzy-core.jar"/>52 <pathelement location="releases/jars/PDFRenderer-0.9.1.jar"/>53 </path>54 45 55 46 <target name="clean"> … … 60 51 <target depends="clean" name="cleanall"/> 61 52 62 63 64 53 <!-- JAVA 1.7 --> 65 54 <target name="init"> … … 83 72 <src path="tests"/> 84 73 <exclude name="org/expeditee/items/widgets/WebBrowser.java"/> 85 <classpath refid=" Expeditee.classpath"/>74 <classpath refid="classpath.exp"/> 86 75 </javac> 87 76 </target> 88 77 <target depends="build" name="jar"> 78 <jar destfile="${dist.dir.exp}/${dist.filename.exp}" manifest="${manifest.path.exp}"> 79 <manifest> 80 <attribute name="Main-Class" value="org.expeditee.gui.Browser"/> 81 <attribute name="Class-Path" value="."/> 82 </manifest> 83 <fileset dir="${build.dir.exp}"> 84 <exclude name="src/**"/> 85 </fileset> 86 </jar> 87 </target> 88 <target depends="build" name="portablejar"> 89 89 <jar destfile="${dist.dir.exp}/${dist.filename.exp}" filesetmanifest="mergewithoutmain"> 90 90 <manifest> … … 95 95 <exclude name="src/**"/> 96 96 </fileset> 97 <resources refid=" dist.includes.exp" />97 <resources refid="portable.includes.exp" /> 98 98 </jar> 99 99 </target> 100 100 <target name="run"> 101 101 <java classname="org.expeditee.gui.Browser" failonerror="true" fork="yes"> 102 <classpath refid=" Expeditee.classpath"/>102 <classpath refid="classpath.exp"/> 103 103 <classpath> 104 104 <pathelement location="${build.dir.exp}"/> … … 128 128 <src path="tests"/> 129 129 <exclude name="org/expeditee/items/widgets/WebBrowser.java"/> 130 <classpath refid=" Expeditee.classpath"/>130 <classpath refid="classpath.exp"/> 131 131 </javac> 132 132 </target> 133 133 <target depends="build6" name="jar6"> 134 <jar destfile="${dist.dir.exp}/${dist.filename.6.exp}" manifest="${manifest.path.exp}"> 135 <manifest> 136 <attribute name="Main-Class" value="org.expeditee.gui.Browser"/> 137 <attribute name="Class-Path" value="."/> 138 </manifest> 139 <fileset dir="${build.dir.6.exp}"> 140 <exclude name="src/**"/> 141 </fileset> 142 </jar> 143 </target> 144 <target depends="build6" name="portablejar6"> 134 145 <jar destfile="${dist.dir.exp}/${dist.filename.6.exp}" filesetmanifest="mergewithoutmain"> 135 146 <manifest> … … 140 151 <exclude name="src/**"/> 141 152 </fileset> 142 <resources refid=" dist.includes.exp" />153 <resources refid="portable.includes.exp" /> 143 154 </jar> 144 155 </target> 145 156 <target name="run6"> 146 157 <java classname="org.expeditee.gui.Browser" failonerror="true" fork="yes"> 147 <classpath refid=" Expeditee.classpath"/>158 <classpath refid="classpath.exp"/> 148 159 <classpath> 149 160 <pathelement location="${build.dir.6.exp}"/>
Note:
See TracChangeset
for help on using the changeset viewer.