From 0c3a463996aaae454964400ebbc57089fc8afae8 Mon Sep 17 00:00:00 2001
From: tkellner <tkellner@174cde9d-5d70-4d2a-aa98-46368bc2aaf7>
Date: Tue, 28 Jan 2014 17:47:30 +0000
Subject: Generate izpack installer in staging dir

git-svn-id: https://joinup.ec.europa.eu/svn/pdf-over/trunk@487 174cde9d-5d70-4d2a-aa98-46368bc2aaf7
---
 pdf-over-gui/pom.xml | 43 ++++++++++++++++++++-----------------------
 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,13 +171,31 @@
 					</execution>
 				</executions>
 				<configuration>
-					<archiveDirectory>target</archiveDirectory>
+					<archiveDirectory>${staging.dir}</archiveDirectory>
 					<includes>
 						<include>*.jar</include>
 					</includes>
 					<verify>true</verify>
 				</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>
@@ -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>
diff --git a/publish.sh b/publish.sh
index 9ad38a05..40222145 100755
--- a/publish.sh
+++ b/publish.sh
@@ -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"
-- 
cgit v1.2.3