diff options
| -rw-r--r-- | pdf-over-gui/pom.xml | 43 | ||||
| -rwxr-xr-x | publish.sh | 7 |
2 files changed, 23 insertions, 27 deletions
diff --git a/pdf-over-gui/pom.xml b/pdf-over-gui/pom.xml index 0e8d7209..94195e32 100644 --- a/pdf-over-gui/pom.xml +++ b/pdf-over-gui/pom.xml @@ -171,7 +171,7 @@ </execution> </executions> <configuration> - <archiveDirectory>target</archiveDirectory> + <archiveDirectory>${staging.dir}</archiveDirectory> <includes> <include>*.jar</include> </includes> @@ -179,6 +179,24 @@ </configuration> </plugin> <plugin> + <groupId>org.codehaus.groovy.maven</groupId> + <artifactId>gmaven-plugin</artifactId> + <version>1.0</version> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>execute</goal> + </goals> + <configuration> + <source> + project.properties["version.exe"] = project.version.split("-")[0] + ".0"; + </source> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <artifactId>maven-resources-plugin</artifactId> <version>2.4.2</version> <executions> @@ -208,26 +226,6 @@ </execution> </executions> </plugin> - - <plugin> - <groupId>org.codehaus.groovy.maven</groupId> - <artifactId>gmaven-plugin</artifactId> - <version>1.0</version> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>execute</goal> - </goals> - <configuration> - <source> - project.properties["version.exe"] = project.version.split("-")[0] + ".0"; - </source> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <groupId>com.akathist.maven.plugins.launch4j</groupId> <artifactId>launch4j-maven-plugin</artifactId> @@ -338,7 +336,6 @@ </execution> </executions> </plugin> - <plugin> <groupId>org.codehaus.izpack</groupId> <artifactId>izpack-maven-plugin</artifactId> @@ -352,7 +349,7 @@ </dependencies> <configuration> <izpackBasedir>${staging.dir}</izpackBasedir> - <izpackOutput>${staging.dir}/setup.jar</izpackOutput> + <installerFile>${staging.dir}/setup.jar</installerFile> </configuration> <executions> <execution> @@ -11,8 +11,7 @@ HOMEPAGE_URL="http:\/\/www.buergerkarte.at" #### DON'T CONFIGURE #### BASEDIR="`dirname $0`" -VERSION=`grep -m1 "<version>" "$BASEDIR/pom.xml" | sed -e "s/[ \t]*<version>\(.*\)<\/version>/\1/"` -TARGET_FILE="pdf-over-gui-$VERSION-standard.jar" +#VERSION=`grep -m1 "<version>" "$BASEDIR/pom.xml" | sed -e "s/[ \t]*<version>\(.*\)<\/version>/\1/"` TBOLDGRAY="\033[1;30m" TGREEN="\033[0;32m" @@ -73,8 +72,8 @@ for (( i = 0 ; i < ${#names[@]} ; i++ )) do continue fi - begin_phase "Moving Installer..." - mv "./pdf-over-gui/target/$TARGET_FILE" "$PUBLISH_DIR/$INSTALLER" + begin_phase "Copying Installer..." + cp "./pdf-over-gui/target/staging/$PROFILE/setup.jar" "$PUBLISH_DIR/$INSTALLER" RETVAL=$? if [ $RETVAL -eq 0 ]; then end_phase "OK" |