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 9f6ad33cd41725fb5f6c484ea690b1a4d7c658e1 Author: Raimund Hocke <[email protected]> Date: Sat Feb 22 08:26:09 2014 +0100 more on fat jar production --- {JythonFat => APIFat}/pom.xml | 13 ++-- Basics/setup-jar.xml | 93 ----------------------------- IDE/ide-jar.xml | 124 --------------------------------------- {JythonFat => IDEFat}/pom.xml | 13 ++-- {JythonFat => JRubyFat}/pom.xml | 12 ++-- JythonFat/pom.xml | 2 +- API/api-jar.xml => Setup/pom.xml | 47 +++++++-------- pom.xml | 4 ++ 8 files changed, 43 insertions(+), 265 deletions(-) diff --git a/JythonFat/pom.xml b/APIFat/pom.xml similarity index 79% copy from JythonFat/pom.xml copy to APIFat/pom.xml index 2393e1e..7aa4970 100644 --- a/JythonFat/pom.xml +++ b/APIFat/pom.xml @@ -19,21 +19,16 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.sikuli</groupId> - <artifactId>SikuliX-JythonFat</artifactId> - <name>SikuliX-JythonFat</name> + <artifactId>SikuliX-APIFat</artifactId> + <name>SikuliX-APIFat</name> <version>1.1.0</version> <dependencies> <dependency> <groupId>org.sikuli</groupId> - <artifactId>SikuliX-Jython</artifactId> + <artifactId>SikuliX-API</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.python</groupId> - <artifactId>jython-standalone</artifactId> - <version>2.7-b1</version> - </dependency> </dependencies> <build> @@ -46,7 +41,7 @@ <descriptors> <descriptor>../${sikuli.jartype}</descriptor> </descriptors> - <finalName>${sikuli.jarname}-4</finalName> + <finalName>${sikuli.jarname}-2</finalName> </configuration> <executions> <execution> diff --git a/Basics/setup-jar.xml b/Basics/setup-jar.xml deleted file mode 100644 index 185d5b4..0000000 --- a/Basics/setup-jar.xml +++ /dev/null @@ -1,93 +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-Project</artifactId> - <version>1.1.0</version> - <relativePath>../</relativePath> - </parent> - - <modelVersion>4.0.0</modelVersion> - - <groupId>org.sikuli</groupId> - <artifactId>SikuliX-Setup</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-Libs</artifactId> - <version>1.1.0</version> - </dependency> - - <dependency> - <groupId>commons-cli</groupId> - <artifactId>commons-cli</artifactId> - <version>1.2</version> - </dependency> - - <dependency> - <groupId>com.melloware</groupId> - <artifactId>jintellitype</artifactId> - <version>1.3.7</version> - </dependency> - - <dependency> - <groupId>jxgrabkey</groupId> - <artifactId>jxgrabkey</artifactId> - <version>1.0</version> - </dependency> - - <dependency> - <groupId>org.swinglabs</groupId> - <artifactId>swing-layout</artifactId> - <version>1.0.3</version> - </dependency> - </dependencies> - - <build> - <defaultGoal>clean package</defaultGoal> - <directory>target-setup</directory> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.4</version> - <configuration> - <archive> - <manifest> - <mainClass>org.sikuli.basics.RunSetup</mainClass> - </manifest> - </archive> - <descriptors> - <descriptor>../${sikuli.jartype}</descriptor> - </descriptors> - <finalName>sikulixsetup-${project.version}</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/IDE/ide-jar.xml b/IDE/ide-jar.xml deleted file mode 100644 index f41fc8e..0000000 --- a/IDE/ide-jar.xml +++ /dev/null @@ -1,124 +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-Project</artifactId> - <version>1.1.0</version> - <relativePath>../</relativePath> - </parent> - - <modelVersion>4.0.0</modelVersion> - - <groupId>org.sikuli</groupId> - <artifactId>SikuliX-IDE</artifactId> - <version>1.1.0</version> - - <dependencies> - <dependency> - <groupId>org.sikuli</groupId> - <artifactId>SikuliX-API</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.sikuli</groupId> - <artifactId>SikuliX-Jython</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.sikuli</groupId> - <artifactId>SikuliX-JRuby</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>com.googlecode.json-simple</groupId> - <artifactId>json-simple</artifactId> - <version>1.1.1</version> - </dependency> - <dependency> - <groupId>org.swinglabs.swingx</groupId> - <artifactId>swingx-core</artifactId> - <version>1.6.5-1</version> - </dependency> - <dependency> - <groupId>com.jgoodies</groupId> - <artifactId>forms</artifactId> - <version>1.2.1</version> - </dependency> - <dependency> - <groupId>com.explodingpixels</groupId> - <artifactId>mac_widgets</artifactId> - <version>0.9.5</version> - </dependency> - </dependencies> - - <build> - <defaultGoal>clean package</defaultGoal> - <directory>target-ide</directory> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.1</version> - <configuration> - <excludes> - <exclude>**/${exclude.nativelayer}</exclude> - </excludes> - </configuration> - </plugin> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.4</version> - <configuration> - <archive> - <manifest> - <mainClass>org.sikuli.ide.SikuliIDE</mainClass> - </manifest> - </archive> - <descriptors> - <descriptor>../${sikuli.jartype}</descriptor> - </descriptors> - <finalName>${sikuli.jarname}-ide</finalName> - </configuration> - <executions> - <execution> - <id>make-assembly</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - </plugin> - <!-- to suppress sources in any case --> - <plugin> - <artifactId>maven-source-plugin</artifactId> - <version>2.2.1</version> - <executions> - <execution> - <id>attach-sources</id> - <phase/> - </execution> - </executions> - </plugin> - <!-- to suppress javadocs in any case --> - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.9.1</version> - <executions> - <execution> - <id>attach-javadocs</id> - <phase/> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> diff --git a/JythonFat/pom.xml b/IDEFat/pom.xml similarity index 79% copy from JythonFat/pom.xml copy to IDEFat/pom.xml index 2393e1e..dbb5929 100644 --- a/JythonFat/pom.xml +++ b/IDEFat/pom.xml @@ -19,21 +19,16 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.sikuli</groupId> - <artifactId>SikuliX-JythonFat</artifactId> - <name>SikuliX-JythonFat</name> + <artifactId>SikuliX-IDEFat</artifactId> + <name>SikuliX-IDEFat</name> <version>1.1.0</version> <dependencies> <dependency> <groupId>org.sikuli</groupId> - <artifactId>SikuliX-Jython</artifactId> + <artifactId>SikuliX-IDE</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.python</groupId> - <artifactId>jython-standalone</artifactId> - <version>2.7-b1</version> - </dependency> </dependencies> <build> @@ -46,7 +41,7 @@ <descriptors> <descriptor>../${sikuli.jartype}</descriptor> </descriptors> - <finalName>${sikuli.jarname}-4</finalName> + <finalName>${sikuli.jarname}-1</finalName> </configuration> <executions> <execution> diff --git a/JythonFat/pom.xml b/JRubyFat/pom.xml similarity index 85% copy from JythonFat/pom.xml copy to JRubyFat/pom.xml index 2393e1e..24281b6 100644 --- a/JythonFat/pom.xml +++ b/JRubyFat/pom.xml @@ -19,20 +19,20 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.sikuli</groupId> - <artifactId>SikuliX-JythonFat</artifactId> - <name>SikuliX-JythonFat</name> + <artifactId>SikuliX-JRubyFat</artifactId> + <name>SikuliX-JRubyFat</name> <version>1.1.0</version> <dependencies> <dependency> <groupId>org.sikuli</groupId> - <artifactId>SikuliX-Jython</artifactId> + <artifactId>SikuliX-JRuby</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.python</groupId> - <artifactId>jython-standalone</artifactId> - <version>2.7-b1</version> + <groupId>org.jruby</groupId> + <artifactId>jruby-complete</artifactId> + <version>1.7.10</version> </dependency> </dependencies> diff --git a/JythonFat/pom.xml b/JythonFat/pom.xml index 2393e1e..54ab8c3 100644 --- a/JythonFat/pom.xml +++ b/JythonFat/pom.xml @@ -46,7 +46,7 @@ <descriptors> <descriptor>../${sikuli.jartype}</descriptor> </descriptors> - <finalName>${sikuli.jarname}-4</finalName> + <finalName>${sikuli.jarname}-3</finalName> </configuration> <executions> <execution> diff --git a/API/api-jar.xml b/Setup/pom.xml similarity index 59% rename from API/api-jar.xml rename to Setup/pom.xml index 95533cc..81f3147 100644 --- a/API/api-jar.xml +++ b/Setup/pom.xml @@ -1,13 +1,14 @@ <?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";> + 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. + * + * kelthuzad, RaiMan 2013 + --> - <!-- - * Copyright 2010-2013, Sikuli.org - * Released under the MIT License. - * - * RaiMan 2013 - --> <parent> <groupId>org.sikuli</groupId> <artifactId>SikuliX-Project</artifactId> @@ -15,42 +16,42 @@ <relativePath>../</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> - <groupId>org.sikuli</groupId> - <artifactId>SikuliX-API</artifactId> - <version>1.1.0</version> + <groupId>org.sikuli</groupId> + <artifactId>SikuliX-Setup</artifactId> + <name>SikuliX-Setup</name> + <version>1.1.0</version> <dependencies> <dependency> <groupId>org.sikuli</groupId> - <artifactId>SikuliX-Basics</artifactId> + <artifactId>SikuliX-Libs</artifactId> <version>1.1.0</version> </dependency> <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> + <artifactId>SikuliX-Basics</artifactId> + <version>${project.version}</version> </dependency> - </dependencies> - + </dependencies> + <build> <defaultGoal>clean package</defaultGoal> - <directory>target-api</directory> <plugins> <plugin> <artifactId>maven-assembly-plugin</artifactId> <version>2.4</version> <configuration> + <archive> + <manifest> + <mainClass>org.sikuli.basics.RunSetup</mainClass> + </manifest> + </archive> <descriptors> <descriptor>../${sikuli.jartype}</descriptor> </descriptors> - <finalName>${sikuli.jarname}-api</finalName> + <finalName>sikuli-setup-${project.version}</finalName> </configuration> <executions> <execution> diff --git a/pom.xml b/pom.xml index 834af27..d0d4937 100755 --- a/pom.xml +++ b/pom.xml @@ -223,11 +223,15 @@ <module>Libs</module> <module>Natives</module> <module>Basics</module> + <module>Setup</module> <module>Jython</module> <module>JythonFat</module> <module>JRuby</module> + <module>JRubyFat</module> <module>API</module> + <module>APIFat</module> <module>IDE</module> + <module>IDEFat</module> <module>MacApp</module> <module>Tesseract</module> <module>Remote</module> -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sikuli.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
