Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Struckmann2015-08-24 09:57:38 -0400
committerGerrit Code Review @ Eclipse.org2015-08-24 09:57:39 -0400
commite9655b8d5190d194040ebe095c492ece4157002f (patch)
tree07cd25fb692e887888c06163f712c1c459476e99 /org.eclipse.jubula.examples.aut.adder.swt
parent7994845bebf7a09a3e7c7905809c35d21eb8cb58 (diff)
parent323ee2a4bad10bd1470b38e33bc1331a06b06fb5 (diff)
downloadorg.eclipse.jubula.core-e9655b8d5190d194040ebe095c492ece4157002f.tar.gz
org.eclipse.jubula.core-e9655b8d5190d194040ebe095c492ece4157002f.tar.xz
org.eclipse.jubula.core-e9655b8d5190d194040ebe095c492ece4157002f.zip
Merge "Non-sprint task - fix for p1 issue http://bugzilla.bredex.de/1729"
Diffstat (limited to 'org.eclipse.jubula.examples.aut.adder.swt')
-rw-r--r--org.eclipse.jubula.examples.aut.adder.swt/buildScript.xml23
-rw-r--r--org.eclipse.jubula.examples.aut.adder.swt/resources/launcher/SimpleAdderSWT.bat2
-rwxr-xr-xorg.eclipse.jubula.examples.aut.adder.swt/resources/launcher/SimpleAdderSWT.sh2
3 files changed, 7 insertions, 20 deletions
diff --git a/org.eclipse.jubula.examples.aut.adder.swt/buildScript.xml b/org.eclipse.jubula.examples.aut.adder.swt/buildScript.xml
index 7f1bf7c44..74a538a8a 100644
--- a/org.eclipse.jubula.examples.aut.adder.swt/buildScript.xml
+++ b/org.eclipse.jubula.examples.aut.adder.swt/buildScript.xml
@@ -44,10 +44,9 @@
<property name="lib" value="../../com.bredexsw.jubula.core/com.bredexsw.guidancer.project.configuration/lib/org.eclipse.jubula.examples.aut.adder.swt"/>
<!-- JARs, DLLs -->
- <property name="swtLibWin32" value="win32-win32-x86/swt.jar"/>
+ <property name="swtLibWin32" value="win32/win32/x86/swt.jar"/>
<property name="swtLibCompile" value="${lib}/${swtLibWin32}"/>
- <property name="swtLibWin32JARCp" value="./lib/${swtLibWin32}"/>
- <property name="swtLibGtkJARCp" value="./lib/gtk-linux-x86/swt.jar"/>
+ <property name="swtLibJARCp" value="./lib/swt.jar"/>
<!-- main class -->
<property name="mainClass" value="org.eclipse.jubula.examples.aut.adder.swt.SimpleAdderSWT"/>
@@ -92,23 +91,11 @@
</javac>
</target>
- <target name="jar" depends="jarWin32, jarGtk">
- </target>
-
- <target name="jarWin32" depends="compile">
- <jar basedir="${classes}" destfile="${jars}/${jarname}Win32.jar">
- <manifest>
- <attribute name="Main-Class" value="${mainClass}"/>
- <attribute name="Class-Path" value="${swtLibWin32JARCp}"/>
- </manifest>
- </jar>
- </target>
-
- <target name="jarGtk" depends="compile">
- <jar basedir="${classes}" destfile="${jars}/${jarname}Gtk.jar">
+ <target name="jar">
+ <jar basedir="${classes}" destfile="${jars}/${jarname}.jar">
<manifest>
<attribute name="Main-Class" value="${mainClass}"/>
- <attribute name="Class-Path" value="${swtLibGtkJARCp}"/>
+ <attribute name="Class-Path" value="${swtLibJARCp}"/>
</manifest>
</jar>
</target>
diff --git a/org.eclipse.jubula.examples.aut.adder.swt/resources/launcher/SimpleAdderSWT.bat b/org.eclipse.jubula.examples.aut.adder.swt/resources/launcher/SimpleAdderSWT.bat
index a5b92b099..dcee7ff94 100644
--- a/org.eclipse.jubula.examples.aut.adder.swt/resources/launcher/SimpleAdderSWT.bat
+++ b/org.eclipse.jubula.examples.aut.adder.swt/resources/launcher/SimpleAdderSWT.bat
@@ -10,4 +10,4 @@
@rem ***************************************************************************
@echo off
-..\..\..\..\jre\bin\javaw -jar SimpleAdderSWTWin32.jar \ No newline at end of file
+..\..\..\..\jre\bin\javaw -jar SimpleAdderSWT.jar \ No newline at end of file
diff --git a/org.eclipse.jubula.examples.aut.adder.swt/resources/launcher/SimpleAdderSWT.sh b/org.eclipse.jubula.examples.aut.adder.swt/resources/launcher/SimpleAdderSWT.sh
index 3610385bc..250e99b46 100755
--- a/org.eclipse.jubula.examples.aut.adder.swt/resources/launcher/SimpleAdderSWT.sh
+++ b/org.eclipse.jubula.examples.aut.adder.swt/resources/launcher/SimpleAdderSWT.sh
@@ -10,4 +10,4 @@
#*******************************************************************************
#! /bin/sh
-../../../../jre/bin/java -jar SimpleAdderSWTGtk.jar \ No newline at end of file
+../../../../jre/bin/java -jar SimpleAdderSWT.jar \ No newline at end of file

Back to the top