diff options
| -rw-r--r-- | pdf-over-gui/src/main/jnlp/pdf-over.jnlp | 6 | ||||
| -rw-r--r-- | pdf-over-gui/src/main/resources/izpack/install.xml | 6 | ||||
| -rw-r--r-- | pdf-over-gui/src/main/resources/izpack/unix_shortcutSpec.xml | 2 | ||||
| -rw-r--r-- | pdf-over-gui/src/main/resources/scripts/pdf-over_linux.sh (renamed from pdf-over-gui/src/main/resources/scripts/pdfover_linux.sh) | 0 | ||||
| -rw-r--r-- | pdf-over-gui/src/main/resources/scripts/pdf-over_mac.sh (renamed from pdf-over-gui/src/main/resources/scripts/pdfover_mac.sh) | 0 | ||||
| -rw-r--r-- | pdf-over-gui/src/main/resources/scripts/pdf-over_win.bat (renamed from pdf-over-gui/src/main/resources/scripts/pdfover_win.bat) | 0 | ||||
| -rwxr-xr-x | publish.sh | 10 |
7 files changed, 12 insertions, 12 deletions
diff --git a/pdf-over-gui/src/main/jnlp/pdf-over.jnlp b/pdf-over-gui/src/main/jnlp/pdf-over.jnlp index 83d380ca..f5264c8d 100644 --- a/pdf-over-gui/src/main/jnlp/pdf-over.jnlp +++ b/pdf-over-gui/src/main/jnlp/pdf-over.jnlp @@ -23,17 +23,17 @@ <resources os="Linux"> <java version="1.6+"/> - <jar href="setup_pdfover_linux.jar" main="true"/> + <jar href="setup_pdf-over_linux.jar" main="true"/> </resources> <resources os="Windows"> <java version="1.6+"/> - <jar href="setup_pdfover_windows.jar" main="true"/> + <jar href="setup_pdf-over_windows.jar" main="true"/> </resources> <resources os="Mac OS X"> <java version="1.6+"/> - <jar href="setup_pdfover_mac.jar" main="true"/> + <jar href="setup_pdf-over_mac.jar" main="true"/> </resources> <application-desc main-class="com.izforge.izpack.installer.Installer"/> diff --git a/pdf-over-gui/src/main/resources/izpack/install.xml b/pdf-over-gui/src/main/resources/izpack/install.xml index 1a487821..aa88d3ab 100644 --- a/pdf-over-gui/src/main/resources/izpack/install.xml +++ b/pdf-over-gui/src/main/resources/izpack/install.xml @@ -65,13 +65,13 @@ <file src="PDF-Over.ini" targetdir="$INSTALL_PATH" os="windows"/> <file src="PDF-Over-Un.ini" targetdir="$INSTALL_PATH/Uninstaller" os="windows"/> <singlefile src="PDF-Over.exe" target="$INSTALL_PATH/Uninstaller/PDF-Over-Un.exe" os="windows"/> - <executable targetfile="$INSTALL_PATH/scripts/pdfover_linux.sh" + <executable targetfile="$INSTALL_PATH/scripts/pdf-over_linux.sh" os="unix" stage="never"></executable> - <executable targetfile="$INSTALL_PATH/scripts/pdfover_win.bat" + <executable targetfile="$INSTALL_PATH/scripts/pdf-over_win.bat" os="windows" stage="never"></executable> <executable targetfile="$INSTALL_PATH/scripts/uninstall_win.bat" os="windows" stage="never"></executable> - <executable targetfile="$INSTALL_PATH/scripts/pdfover_mac.sh" + <executable targetfile="$INSTALL_PATH/scripts/pdf-over_mac.sh" os="mac" stage="never"></executable> </pack> </packs> diff --git a/pdf-over-gui/src/main/resources/izpack/unix_shortcutSpec.xml b/pdf-over-gui/src/main/resources/izpack/unix_shortcutSpec.xml index 141af350..3b69c380 100644 --- a/pdf-over-gui/src/main/resources/izpack/unix_shortcutSpec.xml +++ b/pdf-over-gui/src/main/resources/izpack/unix_shortcutSpec.xml @@ -12,7 +12,7 @@ applications="no" startMenu="yes" startup="no" - target="$INSTALL_PATH/scripts/pdfover_linux.sh" + target="$INSTALL_PATH/scripts/pdf-over_linux.sh" commandLine="" workingDirectory="$INSTALL_PATH" description="PDF-Over 4.0" diff --git a/pdf-over-gui/src/main/resources/scripts/pdfover_linux.sh b/pdf-over-gui/src/main/resources/scripts/pdf-over_linux.sh index b9395340..b9395340 100644 --- a/pdf-over-gui/src/main/resources/scripts/pdfover_linux.sh +++ b/pdf-over-gui/src/main/resources/scripts/pdf-over_linux.sh diff --git a/pdf-over-gui/src/main/resources/scripts/pdfover_mac.sh b/pdf-over-gui/src/main/resources/scripts/pdf-over_mac.sh index e4cd4722..e4cd4722 100644 --- a/pdf-over-gui/src/main/resources/scripts/pdfover_mac.sh +++ b/pdf-over-gui/src/main/resources/scripts/pdf-over_mac.sh diff --git a/pdf-over-gui/src/main/resources/scripts/pdfover_win.bat b/pdf-over-gui/src/main/resources/scripts/pdf-over_win.bat index ae0cbbca..ae0cbbca 100644 --- a/pdf-over-gui/src/main/resources/scripts/pdfover_win.bat +++ b/pdf-over-gui/src/main/resources/scripts/pdf-over_win.bat @@ -52,7 +52,7 @@ names=( linux windows mac ) for (( i = 0 ; i < ${#names[@]} ; i++ )) do PROFILE=${profiles[$i]} NAME=${names[$i]} - INSTALLER=setup_pdfover_$NAME.jar + INSTALLER=setup_pdf-over_$NAME.jar begin_phase "Building package [$PROFILE] as $INSTALLER..." mvn install -P$PROFILE $MVN_PARAMS > $LOG_DIR/build_$NAME.log 2>&1 RETVAL=$? @@ -74,22 +74,22 @@ for (( i = 0 ; i < ${#names[@]} ; i++ )) do done begin_phase "Building JNLP..." -cp ./pdf-over-gui/src/main/jnlp/pdfover.jnlp $PUBLISH_DIR/pdfover.jnlp +cp ./pdf-over-gui/src/main/jnlp/pdf-over.jnlp $PUBLISH_DIR/pdf-over.jnlp RETVAL=$? if [ $RETVAL -ne 0 ]; then end_phase "FAILED" else - sed -i "s/##CODEBASE_URL##/$CODEBASE_URL/g" $PUBLISH_DIR/pdfover.jnlp + sed -i "s/##CODEBASE_URL##/$CODEBASE_URL/g" $PUBLISH_DIR/pdf-over.jnlp RETVAL=$? if [ $RETVAL -ne 0 ]; then end_phase "FAILED" else - sed -i "s/##CONTEXT_URL##/$CONTEXT_URL/g" $PUBLISH_DIR/pdfover.jnlp + sed -i "s/##CONTEXT_URL##/$CONTEXT_URL/g" $PUBLISH_DIR/pdf-over.jnlp RETVAL=$? if [ $RETVAL -ne 0 ]; then end_phase "FAILED" else - sed -i "s/##HOMEPAGE_URL##/$HOMEPAGE_URL/g" $PUBLISH_DIR/pdfover.jnlp + sed -i "s/##HOMEPAGE_URL##/$HOMEPAGE_URL/g" $PUBLISH_DIR/pdf-over.jnlp RETVAL=$? if [ $RETVAL -ne 0 ]; then end_phase "FAILED" |