Skip to content

Commit 6066ad7

Browse files
bentolorbentolor
committed
Align project and files to Maven-like naming style.
Provide -sources.jar bundles.
1 parent 192b438 commit 6066ad7

2 files changed

Lines changed: 19 additions & 17 deletions

File tree

‎ant.properties‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,15 @@ echo3.app.lib.jar ${env.ECHO3_LIB_HOME}/Echo3_App.jar
1111
echo3.webcontainer.lib.jar ${env.ECHO3_LIB_HOME}/Echo3_WebContainer.jar
1212

1313
debug yes
14-
jarfile.extras.app Echo3_Extras_App.jar
15-
jarfile.extras.webcontainer Echo3_Extras_WebContainer.jar
14+
jarfile.extras.app echo3-extras-app-${release.version}.jar
15+
jarfile.extras.webcontainer echo3-extras-webcontainer-${release.version}.jar
16+
srcfile.extras.app echo3-extras-app-${release.version}-sources.jar
17+
srcfile.extras.webcontainer echo3-extras-webcontainer-${release.version}-sources.jar
1618
warfile.testapp ExtrasTest.war
17-
fileprefix.release NextApp_Echo_Extras
18-
zipfile.release ${fileprefix.release}.${release.version}.zip
19-
tarfile.release ${fileprefix.release}.${release.version}.tar
20-
tgzfile.release ${fileprefix.release}.${release.version}.tgz
19+
fileprefix.release echo3-extras
20+
zipfile.release ${fileprefix.release}-${release.version}.zip
21+
tarfile.release ${fileprefix.release}-${release.version}.tar
22+
tgzfile.release ${fileprefix.release}-${release.version}.tgz
2123

2224
dir.temp tmp
2325

‎build.xml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
* the terms of any one of the MPL, the GPL or the LGPL.
3030
-->
3131

32-
<project name="NextApp_Echo_3_Extras" default="dist" basedir=".">
32+
<project name="echo3-extras" default="dist" basedir=".">
3333

3434
<property environment="env"/>
3535
<property file="custom-ant.properties"/>
@@ -79,6 +79,7 @@
7979
<target name="dist.app" depends="clean,compile.app">
8080
<mkdir dir="${dir.dist.lib}"/>
8181
<jar jarfile="${dir.dist.lib}/${jarfile.extras.app}" basedir="${dir.build.server-java.app}"/>
82+
<jar jarfile="${dir.dist.lib}/${srcfile.extras.app}" basedir="${dir.src.server-java.app}"/>
8283
</target>
8384

8485
<target name="test.compile.app" depends="dist.app">
@@ -159,6 +160,7 @@
159160
<target name="dist.webcontainer" depends="clean,compile.webcontainer">
160161
<mkdir dir="${dir.dist.lib}"/>
161162
<jar jarfile="${dir.dist.lib}/${jarfile.extras.webcontainer}" basedir="${dir.build.server-java.webcontainer}"/>
163+
<jar jarfile="${dir.dist.lib}/${srcfile.extras.webcontainer}" basedir="${dir.src.server-java.webcontainer}"/>
162164
</target>
163165

164166
<target name="dist" depends="clean, dist.app, dist.webcontainer"/>
@@ -341,8 +343,6 @@
341343
</target>
342344

343345
<target name="mvn-install" depends="dist" description="Installs the jar into the local maven repository">
344-
<jar basedir="${dir.src.server-java.app}" destfile="dist${file.separator}/echo3extras-app-sources.jar" />
345-
<jar basedir="${dir.src.server-java.webcontainer}" destfile="dist${file.separator}/echo3extras-webcontainer-sources.jar" />
346346
<condition property="onWindows">
347347
<os family="windows"/>
348348
</condition>
@@ -355,19 +355,19 @@
355355
if="onWindows">
356356
<exec executable="cmd">
357357
<arg value="/c"/>
358-
<arg value="mvn install:install-file -DpomFile=resource/maven/echo3extras-app-pom.xml -Dfile=dist${file.separator}lib${file.separator}Echo3_Extras_App.jar"/>
358+
<arg value="mvn install:install-file -DpomFile=resource/maven/echo3extras-app-pom.xml -Dfile=dist${file.separator}lib${file.separator}${jarfile.extras.app}"/>
359359
</exec>
360360
<exec executable="cmd">
361361
<arg value="/c"/>
362-
<arg value="mvn install:install-file -DpomFile=resource/maven/echo3-app-pom.xml -Dfile=dist${file.separator}echo3extras-app-sources.jar -Dclassifier=sources"/>
362+
<arg value="mvn install:install-file -DpomFile=resource/maven/echo3-app-pom.xml -Dfile=dist${file.separator}lib${file.separator}${srcfile.extras.app} -Dclassifier=sources"/>
363363
</exec>
364364
<exec executable="cmd">
365365
<arg value="/c"/>
366-
<arg value="mvn install:install-file -DpomFile=resource/maven/echo3extras-webcontainer-pom.xml -Dfile=dist${file.separator}lib${file.separator}Echo3_Extras_WebContainer.jar"/>
366+
<arg value="mvn install:install-file -DpomFile=resource/maven/echo3extras-webcontainer-pom.xml -Dfile=dist${file.separator}lib${file.separator}${jarfile.extras.webcontainer}"/>
367367
</exec>
368368
<exec executable="cmd">
369369
<arg value="/c"/>
370-
<arg value="mvn install:install-file -DpomFile=resource/maven/echo3-app-pom.xml -Dfile=dist${file.separator}echo3extras-webcontainer-sources.jar -Dclassifier=sources"/>
370+
<arg value="mvn install:install-file -DpomFile=resource/maven/echo3-app-pom.xml -Dfile=dist${file.separator}lib${file.separator}${srcfile.extras.webcontainer} -Dclassifier=sources"/>
371371
</exec>
372372
</target>
373373

@@ -377,24 +377,24 @@
377377
<exec executable="mvn">
378378
<arg value="install:install-file"/>
379379
<arg value="-DpomFile=resource/maven/echo3extras-app-pom.xml"/>
380-
<arg value="-Dfile=dist${file.separator}lib${file.separator}Echo3_Extras_App.jar"/>
380+
<arg value="-Dfile=dist${file.separator}lib${file.separator}${jarfile.extras.app}"/>
381381
</exec>
382382
<exec executable="mvn">
383383
<arg value="install:install-file"/>
384384
<arg value="-DpomFile=resource/maven/echo3extras-app-pom.xml"/>
385385
<arg value="-Dclassifier=sources"/>
386-
<arg value="-Dfile=dist${file.separator}echo3extras-app-sources.jar"/>
386+
<arg value="-Dfile=dist${file.separator}lib${file.separator}${srcfile.extras.app}"/>
387387
</exec>
388388
<exec executable="mvn">
389389
<arg value="install:install-file"/>
390390
<arg value="-DpomFile=resource/maven/echo3extras-webcontainer-pom.xml"/>
391-
<arg value="-Dfile=dist${file.separator}lib${file.separator}Echo3_Extras_WebContainer.jar"/>
391+
<arg value="-Dfile=dist${file.separator}lib${file.separator}${jarfile.extras.webcontainer}"/>
392392
</exec>
393393
<exec executable="mvn">
394394
<arg value="install:install-file"/>
395395
<arg value="-DpomFile=resource/maven/echo3extras-webcontainer-pom.xml"/>
396396
<arg value="-Dclassifier=sources"/>
397-
<arg value="-Dfile=dist${file.separator}echo3extras-webcontainer-sources.jar"/>
397+
<arg value="-Dfile=dist${file.separator}lib${file.separator}${srcfile.extras.webcontainer}"/>
398398
</exec>
399399
</target>
400400

0 commit comments

Comments
 (0)