[sikuli] 170/385: started to revise the general structure again (ready-to-use jars, setup, exported stuff)
Gilles Filippini
pini at moszumanska.debian.org
Sun Jun 29 19:26:06 UTC 2014
This is an automated email from the git hooks/post-receive script.
pini pushed a commit to tag upstream/1.1.0_beta1
in repository sikuli.
commit 93936718b32598c755ec88dadd910565e2ad415e
Author: Raimund Hocke <rmhdevelop at me.com>
Date: Mon Jan 27 11:23:37 2014 +0100
started to revise the general structure again (ready-to-use jars, setup, exported stuff)
---
API/{java-jar.xml => api-jar.xml} | 8 +-
API/pom.xml | 2 +-
API/script-jar.xml | 78 --------
Basics/pom.xml | 2 +-
Basics/setup-jar.xml | 5 +-
.../src/main/java/org/sikuli/basics/RunSetup.java | 197 +++++++--------------
.../main/java/org/sikuli/basics/SetUpSelect.form | 156 ++++++----------
.../main/java/org/sikuli/basics/SetUpSelect.java | 166 ++++++-----------
Basics/src/main/resources/Commands/linux/runIDE | 21 ---
Basics/src/main/resources/Commands/linux/runSetup | 9 -
.../Commands/linux/{runScript => runsikulix} | 6 +-
Basics/src/main/resources/Commands/mac/runScript | 42 -----
Basics/src/main/resources/Commands/mac/runSetup | 9 -
.../resources/Commands/mac/{runIDE => runsikulix} | 11 +-
.../main/resources/Commands/windows/runScript.cmd | 55 ------
.../main/resources/Commands/windows/runSetup.cmd | 12 --
.../windows/{runIDE.cmd => runsikulix.cmd} | 6 +-
Guide/pom.xml | 2 +-
IDE/ide-jar.xml | 2 +-
IDE/pom.xml | 2 +-
Jython/pom.xml | 2 +-
.../sikuli/scriptrunner/JythonScriptRunner.java | 2 +-
Libs/pom.xml | 2 +-
MacApp/pom.xml | 2 +-
.../Contents/Resources/Scripts/main.scpt | Bin 3778 -> 3786 bytes
Natives/pom.xml | 2 +-
OpenCV/pom.xml | 2 +-
Remote/pom.xml | 2 +-
Tesseract/pom.xml | 4 +-
collectJars | 22 +--
pom.xml | 10 +-
31 files changed, 219 insertions(+), 622 deletions(-)
diff --git a/API/java-jar.xml b/API/api-jar.xml
similarity index 90%
rename from API/java-jar.xml
rename to API/api-jar.xml
index 0436263..45473a3 100644
--- a/API/java-jar.xml
+++ b/API/api-jar.xml
@@ -10,7 +10,7 @@
-->
<parent>
<groupId>org.sikuli</groupId>
- <artifactId>SikuliX</artifactId>
+ <artifactId>SikuliX-Project</artifactId>
<version>1.1.0</version>
<relativePath>../</relativePath>
</parent>
@@ -18,7 +18,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.sikuli</groupId>
- <artifactId>SikuliX-Java</artifactId>
+ <artifactId>SikuliX-API</artifactId>
<version>1.1.0-Beta1</version>
<dependencies>
@@ -41,7 +41,7 @@
<build>
<defaultGoal>clean package</defaultGoal>
- <directory>target-java</directory>
+ <directory>target-api</directory>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
@@ -50,7 +50,7 @@
<descriptors>
<descriptor>../${sikuli.jartype}</descriptor>
</descriptors>
- <finalName>${sikuli.jarname}-java</finalName>
+ <finalName>${sikuli.jarname}-api</finalName>
</configuration>
<executions>
<execution>
diff --git a/API/pom.xml b/API/pom.xml
index a3abac9..2bdbef9 100755
--- a/API/pom.xml
+++ b/API/pom.xml
@@ -11,7 +11,7 @@
<parent>
<groupId>org.sikuli</groupId>
- <artifactId>SikuliX</artifactId>
+ <artifactId>SikuliX-Project</artifactId>
<version>1.1.0</version>
<relativePath>../</relativePath>
</parent>
diff --git a/API/script-jar.xml b/API/script-jar.xml
deleted file mode 100644
index 19cc67a..0000000
--- a/API/script-jar.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <!--
- * Copyright 2010-2013, Sikuli.org
- * Released under the MIT License.
- *
- * RaiMan 2013
- -->
-
- <parent>
- <groupId>org.sikuli</groupId>
- <artifactId>SikuliX</artifactId>
- <version>1.1.0</version>
- <relativePath>../</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.sikuli</groupId>
- <artifactId>SikuliX-Script</artifactId>
- <version>1.1.0-Beta1</version>
-
- <dependencies>
- <dependency>
- <groupId>org.sikuli</groupId>
- <artifactId>SikuliX-Natives</artifactId>
- <version>1.1.0</version>
- </dependency>
- <dependency>
- <groupId>org.sikuli</groupId>
- <artifactId>SikuliX-OpenCV</artifactId>
- <version>2.4.7</version>
- </dependency>
- <dependency>
- <groupId>org.sikuli</groupId>
- <artifactId>SikuliX-Jython</artifactId>
- <version>1.1.0</version>
- </dependency>
- <dependency>
- <groupId>org.python</groupId>
- <artifactId>jython-standalone</artifactId>
- <version>2.7-b1</version>
- </dependency>
- </dependencies>
-
- <build>
- <defaultGoal>clean package</defaultGoal>
- <directory>target-script</directory>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.4</version>
- <configuration>
- <archive>
- <manifest>
- <mainClass>org.sikuli.basics.SikuliScript</mainClass>
- </manifest>
- </archive>
- <descriptors>
- <descriptor>../${sikuli.jartype}</descriptor>
- </descriptors>
- <finalName>${sikuli.jarname}-script</finalName>
- </configuration>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/Basics/pom.xml b/Basics/pom.xml
index 5154d4b..fa7d2a7 100755
--- a/Basics/pom.xml
+++ b/Basics/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>org.sikuli</groupId>
- <artifactId>SikuliX</artifactId>
+ <artifactId>SikuliX-Project</artifactId>
<version>1.1.0</version>
<relativePath>../</relativePath>
</parent>
diff --git a/Basics/setup-jar.xml b/Basics/setup-jar.xml
index 06cced7..185d5b4 100644
--- a/Basics/setup-jar.xml
+++ b/Basics/setup-jar.xml
@@ -11,7 +11,7 @@
<parent>
<groupId>org.sikuli</groupId>
- <artifactId>SikuliX</artifactId>
+ <artifactId>SikuliX-Project</artifactId>
<version>1.1.0</version>
<relativePath>../</relativePath>
</parent>
@@ -76,8 +76,7 @@
<descriptors>
<descriptor>../${sikuli.jartype}</descriptor>
</descriptors>
- <finalName>${sikuli.jarname}-java</finalName>
- <finalName>sikuli-setup-${project.version}</finalName>
+ <finalName>sikulixsetup-${project.version}</finalName>
</configuration>
<executions>
<execution>
diff --git a/Basics/src/main/java/org/sikuli/basics/RunSetup.java b/Basics/src/main/java/org/sikuli/basics/RunSetup.java
index f5dabb4..df05e05 100644
--- a/Basics/src/main/java/org/sikuli/basics/RunSetup.java
+++ b/Basics/src/main/java/org/sikuli/basics/RunSetup.java
@@ -44,21 +44,20 @@ public class RunSetup {
private static String downloadSetup;
private static String downloadIDE = version + "-1.jar";
private static String downloadMacApp = version.substring(0, 5) + "-9.jar";
- private static String downloadScript = version + "-2.jar";
- private static String downloadJava = version + "-3.jar";
- private static String downloadTess = version.substring(0, 5) + "-5.jar";
- private static String downloadRServer = version + "-7.jar";
- private static String localJava = "sikuli-java.jar";
- private static String localScript = "sikuli-script.jar";
- private static String localIDE = "sikuli-ide.jar";
- private static String localMacApp = "sikuli-macapp.jar";
- private static String localMacAppIDE = "SikuliX-IDE.app/Contents/sikuli-ide.jar";
+ private static String downloadJava = version + "-2.jar";
+ private static String downloadTess = version.substring(0, 5) + "-8.jar";
+ private static String downloadRServer = version + "-3.jar";
+ private static String localJava = "sikulixapi.jar";
+ private static String localIDE = "sikulix.jar";
+ private static String localMacApp = "sikulixmacapp.jar";
+ private static String localMacAppIDE = "SikuliX-IDE.app/Contents/sikulix.jar";
private static String folderMacApp = "SikuliX-IDE.app";
private static String folderMacAppContent = folderMacApp + "/Contents";
- private static String localSetup = "sikuli-setup-" + majorversion + ".jar";
- private static String localUpdate = "sikuli-update";
- private static String localTess = "sikuli-tessdata.jar";
- private static String localRServer = "sikuli-remoteserver.jar";
+ private static String localSetup = "sikulixsetup-" + majorversion + ".jar";
+ private static String localUpdate = "sikulixupdate";
+ private static String localTess = "sikulixtessdata.jar";
+ private static String localRServer = "sikulixremoteserver.jar";
+ private static String runsikulix = "runsikulix";
private static String localLogfile;
private static SetUpSelect winSU;
private static JFrame winSetup;
@@ -80,7 +79,7 @@ public class RunSetup {
private static boolean runningSetup = false;
private static boolean generallyDoUpdate = false;
public static String timestampBuilt;
- private static final String tsb = "##--##Fri Jan 3 18:54:28 CET 2014##--##";
+ private static final String tsb = "##--##Tue Jan 21 15:52:52 CET 2014##--##";
static {
timestampBuilt = SikuliX.makeTimestamp(tsb);
@@ -319,7 +318,7 @@ public class RunSetup {
File localJarSetup = new File(workDir, localSetup);
File localJarIDE = new File(workDir, localIDE);
- File localJarScript = new File(workDir, localScript);
+// File localJarScript = new File(workDir, localScript);
File localJarJava = new File(workDir, localJava);
File localMacFolder = new File(workDir, folderMacApp);
@@ -334,7 +333,7 @@ public class RunSetup {
+ "\nClick YES, if you want to install ..."
+ "\ncurrent stuff will be saved to BackUp."
+ "\n... Click NO to skip ...";
- if (localJarIDE.exists() || localJarScript.exists()
+ if (localJarIDE.exists() //|| localJarScript.exists()
|| localJarJava.exists() || localMacFolder.exists()) {
int avail = -1;
boolean someUpdate = false;
@@ -592,35 +591,10 @@ public class RunSetup {
//<editor-fold defaultstate="collapsed" desc="option setup: download">
if (!isUpdateSetup) {
- if (winSU.option1.isSelected() && winSU.option2.isSelected()) {
- if (!popAsk("You either need IDE (1) --OR-- Script (2) !\n"
- + "When proceeding (YES), you only will get the IDE,\n"
- + "which can be used the same way as Script from commandline.\n"
- + "If not sure, click (NO), and run setup again to have a\n"
- + "deeper look at the provided help information (H buttons).")) {
- userTerminated("options 1 and 2 selected");
- }
- }
if (winSU.option1.isSelected()) {
getIDE = true;
}
- if (winSU.option2.isSelected() && !getIDE) {
- getScript = true;
- }
- if (winSU.option3.isSelected()) {
- getJava = true;
- }
if (winSU.option4.isSelected()) {
- if (getIDE || getScript) {
- if (!popAsk("You selected Option 4, but also Option 1 or 2 !\n"
- + "When proceeding (YES), you will only get Pack 3.\n"
- + "If not sure, click (NO), and run setup again to have a\n"
- + "deeper look at the provided help information (H buttons).")) {
- userTerminated("option 4 selected and options 1 or 2");
- }
- }
- getIDE = false;
- getScript = false;
getJava = true;
}
if (winSU.option5.isSelected()) {
@@ -640,7 +614,7 @@ public class RunSetup {
getRServer = true;
}
- if (((getTess || forAllSystems) && !(getIDE || getScript || getJava))) {
+ if (((getTess || forAllSystems) && !(getIDE || getJava))) {
popError("You only selected Option 5 or 6 !\n"
+ "This is currently not supported.\n"
+ "Please start allover again with valid options.\n");
@@ -657,10 +631,10 @@ public class RunSetup {
getIDE = true;
msg += "Pack 1: " + localIDE + "\n";
}
- if (new File(workDir, localScript).exists()) {
- getScript = true;
- msg += "Pack 2: " + localScript + "\n";
- }
+// if (new File(workDir, localScript).exists()) {
+// getScript = true;
+// msg += "Pack 2: " + localScript + "\n";
+// }
if (new File(workDir, localJava).exists()) {
getJava = true;
msg += "Pack 3: " + localJava + "\n";
@@ -692,9 +666,9 @@ public class RunSetup {
msg += "\n" + downloadMacApp;
}
}
- if (getScript) {
- msg += "\n--- Package 2 ---\n" + downloadScript;
- }
+// if (getScript) {
+// msg += "\n--- Package 2 ---\n" + downloadScript;
+// }
if (getJava) {
msg += "\n--- Package 3 ---\n" + downloadJava;
}
@@ -744,13 +718,14 @@ public class RunSetup {
}
downloadOK &= dlOK;
}
- } else if (getScript) {
- localJar = new File(workDir, localScript).getAbsolutePath();
- if (!test) {
- downloadOK = download(downloadBaseDir, workDir, downloadScript, localJar);
- }
- downloadOK &= dlOK;
}
+// else if (getScript) {
+// localJar = new File(workDir, localScript).getAbsolutePath();
+// if (!test) {
+// downloadOK = download(downloadBaseDir, workDir, downloadScript, localJar);
+// }
+// downloadOK &= dlOK;
+// }
if (getJava) {
targetJar = new File(workDir, localJava).getAbsolutePath();
if (!test) {
@@ -840,16 +815,16 @@ public class RunSetup {
String[] jarsList = new String[]{null, null, null};
String localTemp = "sikuli-temp.jar";
- String[] localJars = new String[3];
+ String[] localJars = new String[] {null, null, null};
String localTestJar = null;
if (getIDE) {
localJars[0] = localIDE;
localTestJar = (new File(workDir, localIDE)).getAbsolutePath();
}
- if (getScript) {
- localJars[1] = localScript;
- localTestJar = (new File(workDir, localScript)).getAbsolutePath();
- }
+// if (getScript) {
+// localJars[1] = localScript;
+// localTestJar = (new File(workDir, localScript)).getAbsolutePath();
+// }
if (getJava) {
localJars[2] = localJava;
}
@@ -890,38 +865,30 @@ public class RunSetup {
if (Settings.isWindows()) {
if (getIDE) {
- loader.export("Commands/windows#runIDE.cmd", workDir);
- } else if (getScript) {
- loader.export("Commands/windows#runScript.cmd", workDir);
+ loader.export("Commands/windows#"+ runsikulix + ".cmd", workDir);
}
} else if (Settings.isMac()) {
if (getIDE) {
String fmac = new File(workDir, folderMacAppContent).getAbsolutePath();
- loader.export("Commands/mac#runIDE", fmac);
- loader.export("Commands/mac#runIDE", workDir);
+ loader.export("Commands/mac#"+ runsikulix, fmac);
+ loader.export("Commands/mac#"+ runsikulix, workDir);
loader.doSomethingSpecial("runcmd", new String[]{"chmod", "ugo+x",
- new File(fmac, "runIDE").getAbsolutePath()});
+ new File(fmac, runsikulix).getAbsolutePath()});
loader.doSomethingSpecial("runcmd", new String[]{"chmod", "ugo+x",
new File(fmac, "MacOS/droplet").getAbsolutePath()});
loader.doSomethingSpecial("runcmd", new String[]{"chmod", "ugo+x",
- new File(workDir, "runIDE").getAbsolutePath()});
+ new File(workDir, runsikulix).getAbsolutePath()});
// FileManager.deleteFileOrFolder(new File(workDir, localIDE).getAbsolutePath());
FileManager.deleteFileOrFolder(new File(workDir, localMacApp).getAbsolutePath());
localTestJar = new File(fmac, localIDE).getAbsolutePath();
- } else if (getScript) {
- loader.export("Commands/mac#runScript", workDir);
- loader.doSomethingSpecial("runcmd", new String[]{"chmod", "ugo+x", new File(workDir, "runScript").getAbsolutePath()});
}
} else if (Settings.isLinux()) {
if (getIDE) {
- loader.export("Commands/linux#runIDE", workDir);
- loader.doSomethingSpecial("runcmd", new String[]{"chmod", "ugo+x", new File(workDir, "runIDE").getAbsolutePath()});
+ loader.export("Commands/linux#"+ runsikulix, workDir);
+ loader.doSomethingSpecial("runcmd", new String[]{"chmod", "ugo+x", new File(workDir, runsikulix).getAbsolutePath()});
loader.doSomethingSpecial("runcmd", new String[]{"chmod", "ugo+x", new File(workDir, localIDE).getAbsolutePath()});
- } else if (getScript) {
- loader.export("Commands/linux#runScript", workDir);
- loader.doSomethingSpecial("runcmd", new String[]{"chmod", "ugo+x", new File(workDir, "runScript").getAbsolutePath()});
}
}
closeSplash(splash);
@@ -1080,10 +1047,10 @@ public class RunSetup {
log1(lvl, "restoring " + localIDE);
new File(backup, localIDE).renameTo(new File(workDir, localIDE));
}
- if (new File(backup, localScript).exists() && !new File(workDir, localScript).exists()) {
- log1(lvl, "restoring " + localScript);
- new File(backup, localScript).renameTo(new File(workDir, localScript));
- }
+// if (new File(backup, localScript).exists() && !new File(workDir, localScript).exists()) {
+// log1(lvl, "restoring " + localScript);
+// new File(backup, localScript).renameTo(new File(workDir, localScript));
+// }
if (new File(backup, localJava).exists() && !new File(workDir, localJava).exists()) {
log1(lvl, "restoring " + localJava);
new File(backup, localJava).renameTo(new File(workDir, localJava));
@@ -1149,8 +1116,8 @@ public class RunSetup {
return false;
} else if (isUpdate && entry.getName().equals(localIDE)) {
return false;
- } else if (isUpdate && entry.getName().equals(localScript)) {
- return false;
+// } else if (isUpdate && entry.getName().equals(localScript)) {
+// return false;
} else if (isUpdate && entry.getName().equals(localJava)) {
return false;
} else if (isUpdate && entry.getName().equals(localTess)) {
@@ -1182,19 +1149,18 @@ public class RunSetup {
+ "help to decide, wether to select it ------------------";
switch (option) {
case (1):
- om = "Package 1: You get the Sikuli IDE which supports all usages of Sikuli";
+ om = "Package 1: You get SikuliX (sikulix.jar) which supports all usages of Sikuli";
// -------------------------------------------------------------
- m += "\nIt is the largest package of course ...";
- m += "\nIt is recommended for people new to Sikuli "
- + "and those who want to develop scripts with the Sikuli IDE";
+ m += "\nIt is recommended for people new to Sikuli to get a feeling";
+ m += "\nand those who want to develop Sikuli scripts with the Sikuli IDE";
+ m += "\nand those who want to run Sikuli scripts from commandline.";
m += "\n\nFor those who know ;-) additionally you can ...";
- m += "\n- use it to run scripts from commandline";
m += "\n- develop Java programs with Sikuli features in IDE's like Eclipse, NetBeans, ...";
m += "\n- develop in any Java aware scripting language adding Sikuli features in IDE's like Eclipse, NetBeans, ...";
- m += "\n\nJython developement: special info:";
- m += "\n If you want to use standalone Jython in parallel, you should select Pack 3 additionally (Option 3)";
- m += "\n\nTo understand the differences, it might be helpful to read the other informations too (Pack 2 and Pack 3)";
- m += "\nBut again: If you want to run scripts from command line, this IDE package is able to do it the same way as Pack 2";
+ m += "\n\nJython and Java developement: special info:";
+ m += "\nIf you want to use standalone Jython or want to develop in Java in parallel,";
+ m += "\nyou should select Package 2 additionally (Option 2)";
+ m += "\nIn these cases, Package 1 (SikuliX) can be used for image management and for small tests/trials.";
if (Settings.isWindows()) {
m += "\n\nSpecial info for Windows systems:";
m += "\nThe generated jars can be used out of the box with Java 32-Bit and Java 64-Bit as well.";
@@ -1211,44 +1177,8 @@ public class RunSetup {
}
break;
case (2):
- om = "Package 2: To allow to run Sikuli scripts from command line (no IDE)"
- + "\n\n... make sure Option 1 (IDE) is not selected, if you really want this now!"
- + "\nIf you really want it too on the same machine, run setup again afterwards from a different folder";
-// -------------------------------------------------------------
- m += "\nThe primary pupose of this package: run Sikuli scripts from command line ;-)";
- m += "\nIt should be used on machines, that only run scripts and where is no need"
- + " to have the IDE or it is even not wanted to have it";
- m += "\n\nFor those who know ;-) additionally you can ...";
- m += "\n- develop Java programs with Sikuli features in IDE's like Eclipse, NetBeans, ...";
- m += "\n- develop in any Java aware scripting language adding Sikuli features in IDE's like Eclipse, NetBeans, ...";
- m += "\n\nJython developement: special info:";
- m += "\n If you want to use standalone Jython in parallel, you should select Pack 3 additionally (Option 3)";
- if (Settings.isWindows()) {
- m += "\n\nSpecial info for Windows systems:";
- m += "\nThe generated jars can be used out of the box with Java 32-Bit and Java 64-Bit as well.";
- m += "\nThe Java version is detected at runtime and the native support is switched accordingly.";
- }
- break;
- case (3):
- om = "Package 3: ... in addition to Package 1 or Package 2 for use with Jython";
-// -------------------------------------------------------------
- m += "\nThis package is of interest, if you plan to develop Jython scripts outside of the"
- + " SikuliX environment using your own standalon Jython or other IDE's";
- m += "\nThe advantage: since it does not contain the Jython interpreter package, there"
- + " cannot be any collisions on the Python path.";
- m += "\n\nIt contains the Sikuli Jython API, adds itself to Python path at runtime"
- + "\nand exports the Sikuli Python modules to the folder libs/Libs"
- + " that helps to setup the auto-complete in IDE's like NetBeans, Eclipse ...";
- if (Settings.isWindows()) {
- m += "\n\nSpecial info for Windows systems:";
- m += "\nThe generated jars can be used out of the box with Java 32-Bit and Java 64-Bit as well.";
- m += "\nThe Java version is detected at runtime and the native support is switched accordingly.";
- }
- break;
- case (5):
- om = "Package 3: To support developement in Java or any Java aware scripting language"
- + "\n\n( ... make sure neither Option 1 (IDE) nor Option 2 (Script) is selected!"
- + "\nIf you want it additionally to IDE or Script, use the previous Option 3!)";
+ om = "Package 2: To support developement in Java or any Java aware scripting language. you get sikulixapi.jar."
+ + "\nYou might want Pachkage 1 (SikuliX) additionally to use the IDE for managing the images or some trials.";
// -------------------------------------------------------------
m += "\nThe content of this package is stripped down to what is needed to develop in Java"
+ " or any Java aware scripting language \n(no IDE, no bundled script run support for Jython)";
@@ -1256,7 +1186,7 @@ public class RunSetup {
+ " for developement or at runtime";
m += "\n\nSpecial info for usage with Jython: It contains the Sikuli Jython API ..."
+ "\n... and adds itself to Python path at runtime"
- + "\n... and exports the Sikuli Python modules to the folder libs/Libs at runtime"
+ + "\n... and exports the Sikuli Python modules to the folder Libs at runtime"
+ "\nthat helps to setup the auto-complete in IDE's like NetBeans, Eclipse ...";
if (Settings.isWindows()) {
m += "\n\nSpecial info for Windows systems:";
@@ -1264,7 +1194,7 @@ public class RunSetup {
m += "\nThe Java version is detected at runtime and the native support is switched accordingly.";
}
break;
- case (4):
+ case (3):
om = "To get the additional Tesseract stuff into your packages to use the OCR engine";
// -------------------------------------------------------------
m += "\nOnly makes sense for Windows and Mac,"
@@ -1276,7 +1206,7 @@ public class RunSetup {
m += "\n\nIt is NOT recommended for people new to Sikuli."
+ "\nYou might add this feature later after having gathered some experiences with Sikuli";
break;
- case (6):
+ case (4):
om = "To prepare the selected packages to run on all supported systems";
// -------------------------------------------------------------
m += "\nWith this option NOT selected, the setup process will only add the system specific"
@@ -1290,7 +1220,7 @@ public class RunSetup {
m += "\n- use the jars from a stick or similar mobile medium";
m += "\n- deploying Sikuli apps to be used all over the place";
break;
- case (7):
+ case (5):
om = "To try out the experimental remote feature";
// -------------------------------------------------------------
m += "\nYou might start the downloaded jar on any system, that is reachable "
@@ -1307,9 +1237,6 @@ public class RunSetup {
+ "\n\nMore information: https://github.com/RaiMan/SikuliX-Remote";
break;
}
- if (option == 4 || option == 5) {
- option = option == 4 ? 5 : 4;
- }
popInfo("asking for option " + option + ": " + om + "\n" + m);
}
diff --git a/Basics/src/main/java/org/sikuli/basics/SetUpSelect.form b/Basics/src/main/java/org/sikuli/basics/SetUpSelect.form
index 352800f..64a2035 100644
--- a/Basics/src/main/java/org/sikuli/basics/SetUpSelect.form
+++ b/Basics/src/main/java/org/sikuli/basics/SetUpSelect.form
@@ -30,12 +30,20 @@
<Component id="jSeparator2" alignment="0" max="32767" attributes="0"/>
<Component id="jSeparator5" alignment="0" max="32767" attributes="0"/>
<Component id="jSeparator6" alignment="1" max="32767" attributes="0"/>
- <Component id="jSeparator7" alignment="1" max="32767" attributes="0"/>
<Group type="102" alignment="1" attributes="0">
- <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
- <Component id="jButton1" min="-2" max="-2" attributes="0"/>
- <EmptySpace type="separate" max="-2" attributes="0"/>
- <Component id="setupNow" min="-2" max="-2" attributes="0"/>
+ <Component id="option1" min="-2" max="-2" attributes="0"/>
+ <EmptySpace max="32767" attributes="0"/>
+ <Component id="ask1" min="-2" max="-2" attributes="0"/>
+ </Group>
+ <Group type="102" alignment="0" attributes="0">
+ <Component id="option4" min="-2" max="-2" attributes="0"/>
+ <EmptySpace max="32767" attributes="0"/>
+ <Component id="ask5" min="-2" max="-2" attributes="0"/>
+ </Group>
+ <Group type="102" alignment="0" attributes="0">
+ <Component id="option5" min="-2" max="-2" attributes="0"/>
+ <EmptySpace max="32767" attributes="0"/>
+ <Component id="ask4" min="-2" max="-2" attributes="0"/>
</Group>
<Group type="102" attributes="0">
<Group type="103" groupAlignment="0" attributes="0">
@@ -67,44 +75,43 @@
</Group>
<Component id="jLabel5" alignment="0" min="-2" max="-2" attributes="0"/>
<Group type="102" alignment="0" attributes="0">
- <EmptySpace min="-2" pref="23" max="-2" attributes="0"/>
+ <Component id="option6" min="-2" max="-2" attributes="0"/>
+ <EmptySpace max="-2" attributes="0"/>
+ <Component id="ask6" min="-2" max="-2" attributes="0"/>
+ </Group>
+ </Group>
+ <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
+ </Group>
+ <Group type="102" alignment="1" attributes="0">
+ <Group type="103" groupAlignment="0" attributes="0">
+ <Component id="option7" alignment="0" min="-2" max="-2" attributes="0"/>
+ <Group type="102" alignment="0" attributes="0">
+ <EmptySpace min="-2" pref="29" max="-2" attributes="0"/>
<Component id="jLabel6" min="-2" max="-2" attributes="0"/>
- <EmptySpace type="separate" max="-2" attributes="0"/>
+ <EmptySpace max="32767" attributes="0"/>
<Component id="jLabel7" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="pName" min="-2" pref="193" max="-2" attributes="0"/>
<EmptySpace type="separate" max="-2" attributes="0"/>
<Component id="jLabel8" min="-2" max="-2" attributes="0"/>
- <EmptySpace max="-2" attributes="0"/>
- <Component id="pPort" min="-2" pref="69" max="-2" attributes="0"/>
</Group>
</Group>
- <EmptySpace min="0" pref="45" max="32767" attributes="0"/>
- </Group>
- <Group type="102" alignment="1" attributes="0">
+ <EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
- <Component id="option1" alignment="0" min="-2" max="-2" attributes="0"/>
- <Component id="option2" alignment="0" min="-2" max="-2" attributes="0"/>
- <Component id="option3" alignment="0" min="-2" max="-2" attributes="0"/>
- <Component id="option4" alignment="0" min="-2" max="-2" attributes="0"/>
- <Component id="option5" alignment="0" min="-2" max="-2" attributes="0"/>
- <Component id="option6" alignment="0" min="-2" max="-2" attributes="0"/>
- <Component id="option7" alignment="0" min="-2" max="-2" attributes="0"/>
- </Group>
- <EmptySpace max="32767" attributes="0"/>
- <Group type="103" groupAlignment="0" max="-2" attributes="0">
- <Component id="ask7" pref="50" max="32767" attributes="0"/>
- <Component id="ask6" max="32767" attributes="0"/>
- <Component id="ask4" max="32767" attributes="0"/>
- <Component id="ask5" max="32767" attributes="0"/>
- <Component id="ask3" max="32767" attributes="0"/>
- <Component id="ask2" max="32767" attributes="0"/>
- <Component id="ask1" max="32767" attributes="0"/>
+ <Component id="pPort" min="-2" pref="69" max="-2" attributes="0"/>
+ <Component id="ask7" min="-2" max="-2" attributes="0"/>
</Group>
</Group>
</Group>
<EmptySpace max="-2" attributes="0"/>
</Group>
+ <Group type="102" alignment="1" attributes="0">
+ <EmptySpace max="32767" attributes="0"/>
+ <Component id="jButton1" min="-2" max="-2" attributes="0"/>
+ <EmptySpace max="-2" attributes="0"/>
+ <Component id="setupNow" min="-2" max="-2" attributes="0"/>
+ <EmptySpace min="-2" pref="20" max="-2" attributes="0"/>
+ </Group>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
@@ -145,16 +152,6 @@
</Group>
<EmptySpace type="separate" max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
- <Component id="option2" alignment="3" min="-2" max="-2" attributes="0"/>
- <Component id="ask2" alignment="3" min="-2" max="-2" attributes="0"/>
- </Group>
- <EmptySpace type="separate" max="-2" attributes="0"/>
- <Group type="103" groupAlignment="3" attributes="0">
- <Component id="option3" alignment="3" min="-2" max="-2" attributes="0"/>
- <Component id="ask3" alignment="3" min="-2" max="-2" attributes="0"/>
- </Group>
- <EmptySpace type="separate" max="-2" attributes="0"/>
- <Group type="103" groupAlignment="3" attributes="0">
<Component id="option4" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="ask5" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
@@ -165,27 +162,25 @@
</Group>
<EmptySpace type="separate" max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
- <Component id="ask6" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="option6" alignment="3" min="-2" max="-2" attributes="0"/>
+ <Component id="ask6" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
- <EmptySpace type="separate" max="-2" attributes="0"/>
- <Group type="103" groupAlignment="3" attributes="0">
- <Component id="ask7" alignment="3" min="-2" max="-2" attributes="0"/>
- <Component id="option7" alignment="3" min="-2" max="-2" attributes="0"/>
+ <EmptySpace type="unrelated" max="-2" attributes="0"/>
+ <Group type="103" groupAlignment="1" attributes="0">
+ <Component id="ask7" min="-2" max="-2" attributes="0"/>
+ <Component id="option7" min="-2" max="-2" attributes="0"/>
</Group>
- <EmptySpace max="-2" attributes="0"/>
- <Component id="jSeparator6" min="-2" pref="10" max="-2" attributes="0"/>
- <EmptySpace max="-2" attributes="0"/>
+ <EmptySpace min="-2" pref="28" max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="jLabel6" alignment="3" min="-2" max="-2" attributes="0"/>
- <Component id="pName" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="jLabel7" alignment="3" min="-2" max="-2" attributes="0"/>
+ <Component id="pName" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="jLabel8" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="pPort" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
- <EmptySpace max="-2" attributes="0"/>
- <Component id="jSeparator7" min="-2" pref="10" max="-2" attributes="0"/>
- <EmptySpace max="-2" attributes="0"/>
+ <EmptySpace type="unrelated" max="-2" attributes="0"/>
+ <Component id="jSeparator6" min="-2" pref="10" max="-2" attributes="0"/>
+ <EmptySpace type="unrelated" max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="jButton1" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="setupNow" alignment="3" min="-2" max="-2" attributes="0"/>
@@ -254,40 +249,21 @@
</Component>
<Component class="javax.swing.JCheckBox" name="option1">
<Properties>
- <Property name="text" type="java.lang.String" value="1 - Pack1: I want to use all options: Sikuli IDE, running scripts from commandline (and optionally Java developement)"/>
- </Properties>
- <AuxValues>
- <AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="4"/>
- </AuxValues>
- </Component>
- <Component class="javax.swing.JCheckBox" name="option4">
- <Properties>
- <Property name="text" type="java.lang.String" value="4 - Pack3: I ONLY want to develop in Java or Jython using NetBeans, Eclipse or other IDE's (I do not need Pack1 nor Pack2)"/>
+ <Property name="text" type="java.lang.String" value="1 - Pack1: I want SikuliX, containing the Sikuli IDE and allowing to run Sikuli scripts from commandline "/>
</Properties>
<Events>
- <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="option4ActionPerformed"/>
- </Events>
- <AuxValues>
- <AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="4"/>
- </AuxValues>
- </Component>
- <Component class="javax.swing.JCheckBox" name="option3">
- <Properties>
- <Property name="text" type="java.lang.String" value="3 - Pack3: Additionally I want to use Eclipse or other IDEs to develop and run scripts in Jython language"/>
- </Properties>
- <Events>
- <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="option3ActionPerformed"/>
+ <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="option1ActionPerformed"/>
</Events>
<AuxValues>
<AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="4"/>
</AuxValues>
</Component>
- <Component class="javax.swing.JCheckBox" name="option2">
+ <Component class="javax.swing.JCheckBox" name="option4">
<Properties>
- <Property name="text" type="java.lang.String" value="2 - Pack2: I want to run Sikuli scripts from command line (same usage as Pack 1, but I do not need the Sikuli IDE)"/>
+ <Property name="text" type="java.lang.String" value="2 - Pack2: I want to develop in Java, Jython or other Java aware scripting language using NetBeans, Eclipse or other IDE's "/>
</Properties>
<Events>
- <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="option2ActionPerformed"/>
+ <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="option4ActionPerformed"/>
</Events>
<AuxValues>
<AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="4"/>
@@ -306,28 +282,6 @@
<AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="1"/>
</AuxValues>
</Component>
- <Component class="javax.swing.JButton" name="ask2">
- <Properties>
- <Property name="text" type="java.lang.String" value="H"/>
- </Properties>
- <Events>
- <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="ask2ActionPerformed"/>
- </Events>
- <AuxValues>
- <AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="1"/>
- </AuxValues>
- </Component>
- <Component class="javax.swing.JButton" name="ask3">
- <Properties>
- <Property name="text" type="java.lang.String" value="H"/>
- </Properties>
- <Events>
- <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="ask3ActionPerformed"/>
- </Events>
- <AuxValues>
- <AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="1"/>
- </AuxValues>
- </Component>
<Component class="javax.swing.JButton" name="ask4">
<Properties>
<Property name="text" type="java.lang.String" value="H"/>
@@ -349,7 +303,7 @@
</Component>
<Component class="javax.swing.JCheckBox" name="option5">
<Properties>
- <Property name="text" type="java.lang.String" value="5 - For Mac and Windows only: I plan to use the Tesseract based OCR features (You should know what you are doing!)"/>
+ <Property name="text" type="java.lang.String" value="3 - For Mac and Windows only: I plan to use the Tesseract based OCR features (You should know what you are doing!)"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="option5ActionPerformed"/>
@@ -371,7 +325,7 @@
</Component>
<Component class="javax.swing.JCheckBox" name="option6">
<Properties>
- <Property name="text" type="java.lang.String" value="6 - I want the packages to be useable on Windows, Mac and Linux (they contain the stuff for all systems - one pack for all)"/>
+ <Property name="text" type="java.lang.String" value="4 - I want the packages to be useable on Windows, Mac and Linux (they contain the stuff for all systems - one pack for all)"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="option6ActionPerformed"/>
@@ -407,8 +361,6 @@
<AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="1"/>
</AuxValues>
</Component>
- <Component class="javax.swing.JSeparator" name="jSeparator7">
- </Component>
<Component class="javax.swing.JLabel" name="jLabel6">
<Properties>
<Property name="text" type="java.lang.String" value="My system uses a proxy to access the internet:"/>
@@ -436,7 +388,7 @@
</Component>
<Component class="javax.swing.JCheckBox" name="option7">
<Properties>
- <Property name="text" type="java.lang.String" value="7 - I want to try the experimental Sikuli Remote feature (getting sikulix-remoteserver.jar - for info click H-button)"/>
+ <Property name="text" type="java.lang.String" value="5 - I want to try the experimental Sikuli Remote feature (getting sikulixremoteserver.jar - for info click H-button)"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="option7ActionPerformed"/>
diff --git a/Basics/src/main/java/org/sikuli/basics/SetUpSelect.java b/Basics/src/main/java/org/sikuli/basics/SetUpSelect.java
index b65a33e..0988d14 100644
--- a/Basics/src/main/java/org/sikuli/basics/SetUpSelect.java
+++ b/Basics/src/main/java/org/sikuli/basics/SetUpSelect.java
@@ -41,12 +41,8 @@ public class SetUpSelect extends javax.swing.JPanel {
jSeparator5 = new javax.swing.JSeparator();
option1 = new javax.swing.JCheckBox();
option4 = new javax.swing.JCheckBox();
- option3 = new javax.swing.JCheckBox();
- option2 = new javax.swing.JCheckBox();
jSeparator6 = new javax.swing.JSeparator();
ask1 = new javax.swing.JButton();
- ask2 = new javax.swing.JButton();
- ask3 = new javax.swing.JButton();
ask4 = new javax.swing.JButton();
setupNow = new javax.swing.JButton();
option5 = new javax.swing.JCheckBox();
@@ -55,7 +51,6 @@ public class SetUpSelect extends javax.swing.JPanel {
ask6 = new javax.swing.JButton();
jButton1 = new javax.swing.JButton();
suVersion = new javax.swing.JLabel();
- jSeparator7 = new javax.swing.JSeparator();
jLabel6 = new javax.swing.JLabel();
pName = new javax.swing.JTextField();
jLabel7 = new javax.swing.JLabel();
@@ -83,26 +78,17 @@ public class SetUpSelect extends javax.swing.JPanel {
jLabel5.setText("Please check the appropriate options below: (click the [ H ] buttons to get more specific information about the option)");
- option1.setText("1 - Pack1: I want to use all options: Sikuli IDE, running scripts from commandline (and optionally Java developement)");
-
- option4.setText("4 - Pack3: I ONLY want to develop in Java or Jython using NetBeans, Eclipse or other IDE's (I do not need Pack1 nor Pack2)");
- option4.addActionListener(new java.awt.event.ActionListener() {
- public void actionPerformed(java.awt.event.ActionEvent evt) {
- option4ActionPerformed(evt);
- }
- });
-
- option3.setText("3 - Pack3: Additionally I want to use Eclipse or other IDEs to develop and run scripts in Jython language");
- option3.addActionListener(new java.awt.event.ActionListener() {
+ option1.setText("1 - Pack1: I want SikuliX, containing the Sikuli IDE and allowing to run Sikuli scripts from commandline ");
+ option1.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
- option3ActionPerformed(evt);
+ option1ActionPerformed(evt);
}
});
- option2.setText("2 - Pack2: I want to run Sikuli scripts from command line (same usage as Pack 1, but I do not need the Sikuli IDE)");
- option2.addActionListener(new java.awt.event.ActionListener() {
+ option4.setText("2 - Pack2: I want to develop in Java, Jython or other Java aware scripting language using NetBeans, Eclipse or other IDE's ");
+ option4.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
- option2ActionPerformed(evt);
+ option4ActionPerformed(evt);
}
});
@@ -113,20 +99,6 @@ public class SetUpSelect extends javax.swing.JPanel {
}
});
- ask2.setText("H");
- ask2.addActionListener(new java.awt.event.ActionListener() {
- public void actionPerformed(java.awt.event.ActionEvent evt) {
- ask2ActionPerformed(evt);
- }
- });
-
- ask3.setText("H");
- ask3.addActionListener(new java.awt.event.ActionListener() {
- public void actionPerformed(java.awt.event.ActionEvent evt) {
- ask3ActionPerformed(evt);
- }
- });
-
ask4.setText("H");
ask4.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -141,7 +113,7 @@ public class SetUpSelect extends javax.swing.JPanel {
}
});
- option5.setText("5 - For Mac and Windows only: I plan to use the Tesseract based OCR features (You should know what you are doing!)");
+ option5.setText("3 - For Mac and Windows only: I plan to use the Tesseract based OCR features (You should know what you are doing!)");
option5.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
option5ActionPerformed(evt);
@@ -155,7 +127,7 @@ public class SetUpSelect extends javax.swing.JPanel {
}
});
- option6.setText("6 - I want the packages to be useable on Windows, Mac and Linux (they contain the stuff for all systems - one pack for all)");
+ option6.setText("4 - I want the packages to be useable on Windows, Mac and Linux (they contain the stuff for all systems - one pack for all)");
option6.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
option6ActionPerformed(evt);
@@ -184,7 +156,7 @@ public class SetUpSelect extends javax.swing.JPanel {
jLabel8.setText("Portnumber:");
- option7.setText("7 - I want to try the experimental Sikuli Remote feature (getting sikulix-remoteserver.jar - for info click H-button)");
+ option7.setText("5 - I want to try the experimental Sikuli Remote feature (getting sikulixremoteserver.jar - for info click H-button)");
option7.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
option7ActionPerformed(evt);
@@ -209,12 +181,18 @@ public class SetUpSelect extends javax.swing.JPanel {
.add(jSeparator2)
.add(jSeparator5)
.add(org.jdesktop.layout.GroupLayout.TRAILING, jSeparator6)
- .add(org.jdesktop.layout.GroupLayout.TRAILING, jSeparator7)
.add(org.jdesktop.layout.GroupLayout.TRAILING, layout.createSequentialGroup()
- .add(0, 0, Short.MAX_VALUE)
- .add(jButton1)
- .add(18, 18, 18)
- .add(setupNow))
+ .add(option1)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .add(ask1))
+ .add(layout.createSequentialGroup()
+ .add(option4)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .add(ask5))
+ .add(layout.createSequentialGroup()
+ .add(option5)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .add(ask4))
.add(layout.createSequentialGroup()
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
.add(layout.createSequentialGroup()
@@ -238,36 +216,33 @@ public class SetUpSelect extends javax.swing.JPanel {
.add(suJava)))))
.add(jLabel5)
.add(layout.createSequentialGroup()
- .add(23, 23, 23)
+ .add(option6)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(ask6)))
+ .add(0, 0, Short.MAX_VALUE))
+ .add(org.jdesktop.layout.GroupLayout.TRAILING, layout.createSequentialGroup()
+ .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(option7)
+ .add(layout.createSequentialGroup()
+ .add(29, 29, 29)
.add(jLabel6)
- .add(18, 18, 18)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.add(jLabel7)
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
.add(pName, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 193, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
.add(18, 18, 18)
- .add(jLabel8)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(pPort, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 69, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)))
- .add(0, 45, Short.MAX_VALUE))
- .add(org.jdesktop.layout.GroupLayout.TRAILING, layout.createSequentialGroup()
+ .add(jLabel8)))
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(option1)
- .add(option2)
- .add(option3)
- .add(option4)
- .add(option5)
- .add(option6)
- .add(option7))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false)
- .add(ask7, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 50, Short.MAX_VALUE)
- .add(ask6, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .add(ask4, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .add(ask5, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .add(ask3, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .add(ask2, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .add(ask1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))))
+ .add(pPort, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 69, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+ .add(ask7))))
.addContainerGap())
+ .add(org.jdesktop.layout.GroupLayout.TRAILING, layout.createSequentialGroup()
+ .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .add(jButton1)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(setupNow)
+ .add(20, 20, 20))
);
layout.setVerticalGroup(
layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
@@ -302,14 +277,6 @@ public class SetUpSelect extends javax.swing.JPanel {
.add(ask1))
.add(18, 18, 18)
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(option2)
- .add(ask2))
- .add(18, 18, 18)
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(option3)
- .add(ask3))
- .add(18, 18, 18)
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
.add(option4)
.add(ask5))
.add(18, 18, 18)
@@ -318,24 +285,22 @@ public class SetUpSelect extends javax.swing.JPanel {
.add(ask4))
.add(18, 18, 18)
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(ask6)
- .add(option6))
- .add(18, 18, 18)
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+ .add(option6)
+ .add(ask6))
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
+ .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
.add(ask7)
.add(option7))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(jSeparator6, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 10, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(28, 28, 28)
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
.add(jLabel6)
- .add(pName, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
.add(jLabel7)
+ .add(pName, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
.add(jLabel8)
.add(pPort, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(jSeparator7, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 10, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
+ .add(jSeparator6, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 10, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
.add(jButton1)
.add(setupNow))
@@ -347,28 +312,12 @@ public class SetUpSelect extends javax.swing.JPanel {
// TODO add your handling code here:
}//GEN-LAST:event_option4ActionPerformed
- private void option3ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_option3ActionPerformed
- // TODO add your handling code here:
- }//GEN-LAST:event_option3ActionPerformed
-
- private void option2ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_option2ActionPerformed
- // TODO add your handling code here:
- }//GEN-LAST:event_option2ActionPerformed
-
private void ask1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_ask1ActionPerformed
RunSetup.helpOption(1);
}//GEN-LAST:event_ask1ActionPerformed
- private void ask2ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_ask2ActionPerformed
- RunSetup.helpOption(2);
- }//GEN-LAST:event_ask2ActionPerformed
-
- private void ask3ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_ask3ActionPerformed
- RunSetup.helpOption(3);
- }//GEN-LAST:event_ask3ActionPerformed
-
private void ask4ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_ask4ActionPerformed
- RunSetup.helpOption(4);
+ RunSetup.helpOption(3);
}//GEN-LAST:event_ask4ActionPerformed
private void setupNowActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_setupNowActionPerformed
@@ -380,7 +329,7 @@ public class SetUpSelect extends javax.swing.JPanel {
}//GEN-LAST:event_option5ActionPerformed
private void ask5ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_ask5ActionPerformed
- RunSetup.helpOption(5);
+ RunSetup.helpOption(2);
}//GEN-LAST:event_ask5ActionPerformed
private void option6ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_option6ActionPerformed
@@ -388,7 +337,7 @@ public class SetUpSelect extends javax.swing.JPanel {
}//GEN-LAST:event_option6ActionPerformed
private void ask6ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_ask6ActionPerformed
- RunSetup.helpOption(6);
+ RunSetup.helpOption(4);
}//GEN-LAST:event_ask6ActionPerformed
private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
@@ -401,13 +350,15 @@ public class SetUpSelect extends javax.swing.JPanel {
}//GEN-LAST:event_option7ActionPerformed
private void ask7ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_ask7ActionPerformed
- RunSetup.helpOption(7);
+ RunSetup.helpOption(5);
}//GEN-LAST:event_ask7ActionPerformed
+ private void option1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_option1ActionPerformed
+ // TODO add your handling code here:
+ }//GEN-LAST:event_option1ActionPerformed
+
// Variables declaration - do not modify//GEN-BEGIN:variables
public javax.swing.JButton ask1;
- public javax.swing.JButton ask2;
- public javax.swing.JButton ask3;
public javax.swing.JButton ask4;
public javax.swing.JButton ask5;
public javax.swing.JButton ask6;
@@ -425,10 +376,7 @@ public class SetUpSelect extends javax.swing.JPanel {
private javax.swing.JSeparator jSeparator2;
private javax.swing.JSeparator jSeparator5;
private javax.swing.JSeparator jSeparator6;
- private javax.swing.JSeparator jSeparator7;
protected javax.swing.JCheckBox option1;
- protected javax.swing.JCheckBox option2;
- protected javax.swing.JCheckBox option3;
protected javax.swing.JCheckBox option4;
protected javax.swing.JCheckBox option5;
protected javax.swing.JCheckBox option6;
diff --git a/Basics/src/main/resources/Commands/linux/runIDE b/Basics/src/main/resources/Commands/linux/runIDE
deleted file mode 100644
index 617f9f5..0000000
--- a/Basics/src/main/resources/Commands/linux/runIDE
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-JAVA=X
-JAVABIN=java
-PROPS='-Xmx512M -Dapple.laf.useScreenMenuBar -Dfile.encoding=UTF-8 -Dsikuli.FromCommandLine'
-
-if [ "$JAVA_HOME" != "" ]; then
- JAVABIN=$JAVA_HOME/bin/java
-fi
-
-if [ "$SIKULIX_HOME" != "" ]; then
- echo "SIKULIX_HOME in environment specified as "$SIKULIX_HOME
- shome=$SIKULIX_HOME
-else
- shome=`dirname $0`
-fi
-
-export SIKULI_COMMAND=$*
-echo "running SikuliX-IDE: $PROPS"
-echo "-jar $shome/sikuli-ide.jar $SIKULI_COMMAND"
-"$JAVABIN" $PROPS -jar "$shome/sikuli-ide.jar" $SIKULI_COMMAND
-
diff --git a/Basics/src/main/resources/Commands/linux/runSetup b/Basics/src/main/resources/Commands/linux/runSetup
deleted file mode 100755
index 5b11371..0000000
--- a/Basics/src/main/resources/Commands/linux/runSetup
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-#################################
-# DO NOT EDIT THIS COMMAND SCRIPT
-#################################
-
-shome=`dirname $0`
-
-java -jar "$shome/sikuli-setup-1.1.jar" $*
-
diff --git a/Basics/src/main/resources/Commands/linux/runScript b/Basics/src/main/resources/Commands/linux/runsikulix
similarity index 67%
rename from Basics/src/main/resources/Commands/linux/runScript
rename to Basics/src/main/resources/Commands/linux/runsikulix
index 0dff2a2..9e03bc7 100644
--- a/Basics/src/main/resources/Commands/linux/runScript
+++ b/Basics/src/main/resources/Commands/linux/runsikulix
@@ -15,7 +15,7 @@ else
fi
export SIKULI_COMMAND=$*
-echo "running SikuliX-Script: $PROPS $CONSOLE"
-echo "-jar $shome/sikuli-script.jar $SIKULI_COMMAND"
-"$JAVABIN" $PROPS -jar "$shome/sikuli-script.jar" $SIKULI_COMMAND
+echo "running SikuliX: $PROPS"
+echo "-jar $shome/sikulix.jar $SIKULI_COMMAND"
+"$JAVABIN" $PROPS -jar "$shome/sikulix.jar" $SIKULI_COMMAND
diff --git a/Basics/src/main/resources/Commands/mac/runScript b/Basics/src/main/resources/Commands/mac/runScript
deleted file mode 100755
index f1b30d9..0000000
--- a/Basics/src/main/resources/Commands/mac/runScript
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-JAVA=X
-PROPS='-Xmx512M -Dfile.encoding=UTF-8 -Dsikuli.FromCommandLine'
-
-if [ "$1" == "-j" ]; then
- shift
- JAVA=$2
- shift
-fi
-
-if [ "$JAVA" != "X" ]; then
- echo "being asked to switch to Java "$JAVA
- if [ "$JAVA" = "6" ]; then
- echo trying Java 6
- export JAVA_HOME=`/usr/libexec/java_home -v 1.6`
- elif [ "$JAVA" = "o" ]; then
- if [ -e /Library/Java/JavaVirtualMachines/1.7.0u.jdk/Contents/Home ]; then
- echo trying OpenJDK 7
- export JAVA_HOME=/Library/Java/JavaVirtualMachines/1.7.0u.jdk/Contents/Home
- fi
- elif [ "$JAVA" = "7" ]; then
- echo trying Java 7
- export JAVA_HOME=`/usr/libexec/java_home -v 1.7`
- fi
-fi
-
-if [ "$SIKULIX_HOME" != "" ]; then
- echo "SIKULIX_HOME in environment specified as "$SIKULIX_HOME
- shome=$SIKULIX_HOME
-else
- shome=`dirname $0`
-fi
-
-if [ -e "$shome/sikuli-script.jar" ]; then
- export SIKULI_COMMAND=$*
- echo "running SikuliX-Script: $PROPS $CONSOLE"
- echo "-jar $shome/sikuli-script.jar $SIKULI_COMMAND"
- java $PROPS -jar "$shome/sikuli-script.jar" $SIKULI_COMMAND
-else
- echo "Error: terminating: sikuli-script.jar not found at: "$shome
-fi
-
diff --git a/Basics/src/main/resources/Commands/mac/runSetup b/Basics/src/main/resources/Commands/mac/runSetup
deleted file mode 100644
index 5d50185..0000000
--- a/Basics/src/main/resources/Commands/mac/runSetup
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-#################################
-# DO NOT EDIT THIS COMMAND SCRIPT
-#################################
-
-shome=`dirname $0`
-
-java -jar "$shome/sikuli-setup-1.1.jar" $*
-
diff --git a/Basics/src/main/resources/Commands/mac/runIDE b/Basics/src/main/resources/Commands/mac/runsikulix
similarity index 81%
rename from Basics/src/main/resources/Commands/mac/runIDE
rename to Basics/src/main/resources/Commands/mac/runsikulix
index f01ab2d..684f228 100755
--- a/Basics/src/main/resources/Commands/mac/runIDE
+++ b/Basics/src/main/resources/Commands/mac/runsikulix
@@ -2,6 +2,7 @@
JAVA=X
PROPS='-Xmx512M -Dapple.laf.useScreenMenuBar -Dfile.encoding=UTF-8'
shome=`dirname $0`
+sjar=sikulix
if [ "$1" == "asApp" ]; then
shift
@@ -13,12 +14,12 @@ else
echo "SIKULIX_HOME in environment specified as "$SIKULIX_HOME
shome=$SIKULIX_HOME
fi
- if [ ! -e "$shome/sikuli-ide.jar" ]; then
+ if [ ! -e "$shome/$sjar.jar" ]; then
shome=/Applications/SikuliX-IDE.app/Contents
fi
fi
-if [ -e "$shome/sikuli-ide.jar" ]; then
+if [ -e "$shome/$sjar.jar" ]; then
if [ "$1" == "-j" ]; then
shift
JAVA=$1
@@ -44,8 +45,8 @@ if [ -e "$shome/sikuli-ide.jar" ]; then
export SIKULI_COMMAND=$*
echo "running SikuliX-IDE: $PROPS"
- echo "-jar $shome/sikuli-ide.jar $SIKULI_COMMAND"
- java $PROPS -jar "$shome/sikuli-ide.jar" $SIKULI_COMMAND
+ echo "-jar $shome/$sjar.jar $SIKULI_COMMAND"
+ java $PROPS -jar "$shome/$sjar.jar" $SIKULI_COMMAND
else
- echo "Error: terminating: sikuli-ide.jar not found at: "$shome
+ echo "Error: terminating: $sjar.jar not found at: "$shome
fi
diff --git a/Basics/src/main/resources/Commands/windows/runScript.cmd b/Basics/src/main/resources/Commands/windows/runScript.cmd
deleted file mode 100644
index a937b65..0000000
--- a/Basics/src/main/resources/Commands/windows/runScript.cmd
+++ /dev/null
@@ -1,55 +0,0 @@
- at echo off
-SETLOCAL ENABLEEXTENSIONS
-
-set SIKULIX_HOME=%~dp0
-set PARMS=-Xms64M -Xmx512M -Dfile.encoding=UTF-8 -Dsikuli.FromCommandLine
-
-if not defined JAVA_HOME goto CHECKJAVA
-IF EXIST "%JAVA_HOME%\bin\java.exe" goto JAVA_OK
-echo +++ JAVA_HOME specified but not useable %JAVA_HOME%
-echo +++ looking for Java in standard places
-
-:CHECKJAVA
-set PROGRAMS=%ProgramFiles%
-if defined ProgramFiles(x86) set PROGRAMS32=%ProgramFiles(x86)%
-
-IF not EXIST "%PROGRAMS%\Java\jre7" goto JAVA6
-set JAVA_HOME=%PROGRAMS%\Java\jre7
-goto JAVA_OK
-
-:JAVA6
-IF not EXIST "%PROGRAMS%\Java\jre6" goto JAVANO
-set JAVA_HOME=%PROGRAMS%\Java\jre6
-goto JAVA_OK
-
-:JAVANO
-if not defined PROGRAMS32 goto JAVANO32
-
-IF not EXIST "%PROGRAMS32%\Java\jre7" goto JAVA632
-set JAVA_HOME=%PROGRAMS32%\Java\jre7
-goto JAVA_OK
-
-:JAVA632
-IF not EXIST "%PROGRAMS32%\Java\jre6" goto JAVANO32
-set JAVA_HOME=%PROGRAMS32%\Java\jre6
-goto JAVA_OK
-
-:JAVANO32
-echo +++ Java not found in standard places %PROGRAMS% or %PROGRAMS32%
-echo +++ JAVA_HOME not specified
-goto STOPIT
-
-:JAVA_OK
-echo +++ running this Java
-set SIKULI_COMMAND=%*
-"%JAVA_HOME%\bin\java.exe" -version
-PATH=%SIKULIX_HOME%libs;%PATH%
-echo +++ trying to start Sikuli Script
-echo +++ using: %PARMS% -jar %SIKULIX_HOME%sikuli-script.jar %SIKULI_COMMAND%
-"%JAVA_HOME%\bin\java.exe" %PARMS% -jar "%SIKULIX_HOME%sikuli-script.jar" %SIKULI_COMMAND%
-
-GOTO FINALLY
-:STOPIT
-echo.+++ ended with some errors
-:FINALLY
-ENDLOCAL
\ No newline at end of file
diff --git a/Basics/src/main/resources/Commands/windows/runSetup.cmd b/Basics/src/main/resources/Commands/windows/runSetup.cmd
deleted file mode 100644
index 473af0d..0000000
--- a/Basics/src/main/resources/Commands/windows/runSetup.cmd
+++ /dev/null
@@ -1,12 +0,0 @@
- at echo off
-SETLOCAL ENABLEEXTENSIONS
-set SIKULIX_HOME=%~dp0
-
-echo +++ trying to start Sikuli Setup in %SIKULIX_HOME%
-PATH=%SIKULIX_HOME%libs;%PATH%
-
-java -jar "%SIKULIX_HOME%sikuli-setup-1.1.jar" %*
-
-ENDLOCAL
-pause
-exit
\ No newline at end of file
diff --git a/Basics/src/main/resources/Commands/windows/runIDE.cmd b/Basics/src/main/resources/Commands/windows/runsikulix.cmd
similarity index 82%
rename from Basics/src/main/resources/Commands/windows/runIDE.cmd
rename to Basics/src/main/resources/Commands/windows/runsikulix.cmd
index 62206f6..66164c9 100644
--- a/Basics/src/main/resources/Commands/windows/runIDE.cmd
+++ b/Basics/src/main/resources/Commands/windows/runsikulix.cmd
@@ -44,9 +44,9 @@ echo +++ running this Java
set SIKULI_COMMAND=%*
"%JAVA_HOME%\bin\java.exe" -version
PATH=%SIKULIX_HOME%libs;%PATH%
-echo +++ trying to start Sikuli IDE
-echo +++ using: %PARMS% -jar %SIKULIX_HOME%sikuli-ide.jar %SIKULI_COMMAND%
-"%JAVA_HOME%\bin\java.exe" %PARMS% -jar "%SIKULIX_HOME%sikuli-ide.jar" %SIKULI_COMMAND%
+echo +++ trying to run SikuliX
+echo +++ using: %PARMS% -jar %SIKULIX_HOME%sikulix.jar %SIKULI_COMMAND%
+"%JAVA_HOME%\bin\java.exe" %PARMS% -jar "%SIKULIX_HOME%sikulix.jar" %SIKULI_COMMAND%
GOTO FINALLY
:STOPIT
diff --git a/Guide/pom.xml b/Guide/pom.xml
index 0a2e61d..b2c73bd 100644
--- a/Guide/pom.xml
+++ b/Guide/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>org.sikuli</groupId>
- <artifactId>SikuliX</artifactId>
+ <artifactId>SikuliX-Project</artifactId>
<version>1.1.0</version>
<relativePath>../</relativePath>
</parent>
diff --git a/IDE/ide-jar.xml b/IDE/ide-jar.xml
index 6ffd42c..cd03a51 100644
--- a/IDE/ide-jar.xml
+++ b/IDE/ide-jar.xml
@@ -11,7 +11,7 @@
<parent>
<groupId>org.sikuli</groupId>
- <artifactId>SikuliX</artifactId>
+ <artifactId>SikuliX-Project</artifactId>
<version>1.1.0</version>
<relativePath>../</relativePath>
</parent>
diff --git a/IDE/pom.xml b/IDE/pom.xml
index 9e82715..c6db608 100755
--- a/IDE/pom.xml
+++ b/IDE/pom.xml
@@ -11,7 +11,7 @@
<parent>
<groupId>org.sikuli</groupId>
- <artifactId>SikuliX</artifactId>
+ <artifactId>SikuliX-Project</artifactId>
<version>1.1.0</version>
<relativePath>../</relativePath>
</parent>
diff --git a/Jython/pom.xml b/Jython/pom.xml
index 0fb756f..32de17e 100755
--- a/Jython/pom.xml
+++ b/Jython/pom.xml
@@ -11,7 +11,7 @@
<parent>
<groupId>org.sikuli</groupId>
- <artifactId>SikuliX</artifactId>
+ <artifactId>SikuliX-Project</artifactId>
<version>1.1.0</version>
<relativePath>../</relativePath>
</parent>
diff --git a/Jython/src/main/java/org/sikuli/scriptrunner/JythonScriptRunner.java b/Jython/src/main/java/org/sikuli/scriptrunner/JythonScriptRunner.java
index 361de3f..8ff21bb 100644
--- a/Jython/src/main/java/org/sikuli/scriptrunner/JythonScriptRunner.java
+++ b/Jython/src/main/java/org/sikuli/scriptrunner/JythonScriptRunner.java
@@ -94,7 +94,7 @@ public class JythonScriptRunner implements IScriptRunner {
private static String sikuliLibPath;
private static String timestampBuilt;
- private static final String tsb = "##--##Fri Jan 3 18:54:44 CET 2014##--##";
+ private static final String tsb = "##--##Tue Jan 21 15:53:09 CET 2014##--##";
static {
Debug.log(3, "SikuliX Jython Support Build: %s %s", Settings.getVersionShort(),
SikuliX.makeTimestamp(tsb));
diff --git a/Libs/pom.xml b/Libs/pom.xml
index 64705ad..6c19898 100644
--- a/Libs/pom.xml
+++ b/Libs/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>org.sikuli</groupId>
- <artifactId>SikuliX</artifactId>
+ <artifactId>SikuliX-Project</artifactId>
<version>1.1.0</version>
<relativePath>../</relativePath>
</parent>
diff --git a/MacApp/pom.xml b/MacApp/pom.xml
index 55dfd25..81f7da7 100644
--- a/MacApp/pom.xml
+++ b/MacApp/pom.xml
@@ -11,7 +11,7 @@
<parent>
<groupId>org.sikuli</groupId>
- <artifactId>SikuliX</artifactId>
+ <artifactId>SikuliX-Project</artifactId>
<version>1.1.0</version>
<relativePath>../</relativePath>
</parent>
diff --git a/MacApp/src/main/resources/SikuliX-IDE.app/Contents/Resources/Scripts/main.scpt b/MacApp/src/main/resources/SikuliX-IDE.app/Contents/Resources/Scripts/main.scpt
index 26128dc..e01b270 100644
Binary files a/MacApp/src/main/resources/SikuliX-IDE.app/Contents/Resources/Scripts/main.scpt and b/MacApp/src/main/resources/SikuliX-IDE.app/Contents/Resources/Scripts/main.scpt differ
diff --git a/Natives/pom.xml b/Natives/pom.xml
index aa9e1b0..b1b4afb 100644
--- a/Natives/pom.xml
+++ b/Natives/pom.xml
@@ -11,7 +11,7 @@
<parent>
<groupId>org.sikuli</groupId>
- <artifactId>SikuliX</artifactId>
+ <artifactId>SikuliX-Project</artifactId>
<version>1.1.0</version>
<relativePath>../</relativePath>
</parent>
diff --git a/OpenCV/pom.xml b/OpenCV/pom.xml
index df0eb83..3a519fb 100644
--- a/OpenCV/pom.xml
+++ b/OpenCV/pom.xml
@@ -11,7 +11,7 @@
<parent>
<groupId>org.sikuli</groupId>
- <artifactId>SikuliX</artifactId>
+ <artifactId>SikuliX-Project</artifactId>
<version>1.1.0</version>
<relativePath>../</relativePath>
</parent>
diff --git a/Remote/pom.xml b/Remote/pom.xml
index efbda81..9299b1a 100644
--- a/Remote/pom.xml
+++ b/Remote/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>org.sikuli</groupId>
- <artifactId>SikuliX</artifactId>
+ <artifactId>SikuliX-Project</artifactId>
<version>1.1.0</version>
<relativePath>../</relativePath>
</parent>
diff --git a/Tesseract/pom.xml b/Tesseract/pom.xml
index 692e82d..c7a2f37 100644
--- a/Tesseract/pom.xml
+++ b/Tesseract/pom.xml
@@ -11,7 +11,7 @@
<parent>
<groupId>org.sikuli</groupId>
- <artifactId>SikuliX</artifactId>
+ <artifactId>SikuliX-Project</artifactId>
<version>1.1.0</version>
<relativePath>../</relativePath>
</parent>
@@ -23,7 +23,7 @@
<version>1.1.0</version>
<build>
- <finalName>${project.version}-5</finalName>
+ <finalName>${project.version}-8</finalName>
<resources>
<resource>
<directory>src/main/resources</directory>
diff --git a/collectJars b/collectJars
index 17a4c38..eebcbe1 100755
--- a/collectJars
+++ b/collectJars
@@ -46,7 +46,7 @@ mvn install >>$log
echo --- make Setup
cd $base
mvn -f Basics/setup* >>$log
-cp Basics/target-setup/sikuli-setup*.jar $dist/sikuli-setup-$mversion.jar
+cp Basics/target-setup/sikulixsetup*.jar $dist/sikulixsetup-$mversion.jar
if [ "$1" != "setup" ]; then
# ---------- Jython
@@ -60,20 +60,14 @@ if [ "$1" != "setup" ]; then
mv -f $out $src
mvn clean install >>$log
- # ----------- Java
- echo --- make Java
+ # ----------- API
+ echo --- make API
cd $base
- mvn -f API/java* >>$log
- cp API/target-java/*java-plain.jar $dist/$version-3.jar
+ mvn -f API/api* >>$log
+ cp API/target-api/*api-plain.jar $dist/$version-2.jar
- # ----------- Script
- echo --- make Script
- cd $base
- mvn -f API/script* >>$log
- cp API/target-script/*script-plain.jar $dist/$version-2.jar
-
- # ----------- IDE
- echo --- make IDE
+ # ----------- SikuliX
+ echo --- make SikuliX
cd $base
mvn -f IDE/ide* >>$log
cp IDE/target-ide/*ide-plain.jar $dist/$version-1.jar
@@ -91,6 +85,6 @@ if [ "$1" != "setup" ]; then
# ----------- Remote
echo --- make Remote
cd $base
- cp Remote/target/*.jar $dist/$version-7.jar
+ cp Remote/target/*.jar $dist/$version-3.jar
fi
grep -i BUILD $log
diff --git a/pom.xml b/pom.xml
index dcee453..58a03b6 100755
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.sikuli</groupId>
- <artifactId>SikuliX</artifactId>
+ <artifactId>SikuliX-Project</artifactId>
<version>1.1.0</version>
<packaging>pom</packaging>
@@ -61,6 +61,7 @@
</repositories>
<dependencies>
+<!-- not yet used
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
@@ -71,6 +72,7 @@
<artifactId>logback-classic</artifactId>
<version>1.0.13</version>
</dependency>
+-->
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
@@ -123,7 +125,7 @@
</activation>
<properties>
<sikuli.jartype>complete.xml</sikuli.jartype>
- <sikuli.jarname>sikuli</sikuli.jarname>
+ <sikuli.jarname>sikulix</sikuli.jarname>
</properties>
</profile>
<profile>
@@ -132,7 +134,7 @@
<activeByDefault>no</activeByDefault>
</activation>
<properties>
- <sikuli.jarname>sikuli</sikuli.jarname>
+ <sikuli.jarname>sikulix</sikuli.jarname>
</properties>
<dependencies>
<dependency>
@@ -148,7 +150,7 @@
<activeByDefault>no</activeByDefault>
</activation>
<properties>
- <sikuli.jarname>sikuli</sikuli.jarname>
+ <sikuli.jarname>sikulix</sikuli.jarname>
</properties>
<dependencies>
<dependency>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sikuli.git
More information about the pkg-java-commits
mailing list