[sikuli] 10/385: be able to create the ready-to-use jars: sikuli-java, sikuli-script, sikuli-ide
Gilles Filippini
pini at moszumanska.debian.org
Sun Jun 29 19:25:41 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 6cf5301a7fc75576d74d5aa3eb2e32c3fddf37d3
Author: Raimund Hocke <rmhdevelop at me.com>
Date: Tue Dec 24 10:58:38 2013 +0100
be able to create the ready-to-use jars: sikuli-java, sikuli-script,sikuli-ide
---
.gitignore | 1 +
API/java-jar.xml | 9 +++----
API/script-jar.xml | 8 +++---
IDE/ide-jar.xml | 8 +++---
SikuliX/complete.xml | 27 +++++++++++++++++++
SikuliX/plain.xml | 18 +++++++++++++
SikuliX/pom.xml | 76 +++++++++++++++++++++++++++++++++++++++-------------
7 files changed, 115 insertions(+), 32 deletions(-)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..8652d88
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+**/target*/*
\ No newline at end of file
diff --git a/API/java-jar.xml b/API/java-jar.xml
index 85dff46..1df3d34 100644
--- a/API/java-jar.xml
+++ b/API/java-jar.xml
@@ -8,7 +8,6 @@
*
* RaiMan 2013
-->
-
<parent>
<groupId>org.sikuli</groupId>
<artifactId>SikuliX-POM</artifactId>
@@ -43,10 +42,10 @@
<artifactId>maven-assembly-plugin</artifactId>
<version>2.4</version>
<configuration>
- <descriptorRefs>
- <descriptorRef>jar-with-dependencies</descriptorRef>
- </descriptorRefs>
- <finalName>${project.version}-3</finalName>
+ <descriptors>
+ <descriptor>../SikuliX/${sikuli.jartype}</descriptor>
+ </descriptors>
+ <finalName>${sikuli.jarname}-java</finalName>
</configuration>
<executions>
<execution>
diff --git a/API/script-jar.xml b/API/script-jar.xml
index ba995d5..e3afaa0 100644
--- a/API/script-jar.xml
+++ b/API/script-jar.xml
@@ -53,10 +53,10 @@
<mainClass>org.sikuli.basics.SikuliScript</mainClass>
</manifest>
</archive>
- <descriptorRefs>
- <descriptorRef>jar-with-dependencies</descriptorRef>
- </descriptorRefs>
- <finalName>${project.version}-2</finalName>
+ <descriptors>
+ <descriptor>../SikuliX/${sikuli.jartype}</descriptor>
+ </descriptors>
+ <finalName>${sikuli.jarname}-script</finalName>
</configuration>
<executions>
<execution>
diff --git a/IDE/ide-jar.xml b/IDE/ide-jar.xml
index 0f7075b..486b551 100644
--- a/IDE/ide-jar.xml
+++ b/IDE/ide-jar.xml
@@ -77,10 +77,10 @@
<mainClass>org.sikuli.ide.SikuliIDE</mainClass>
</manifest>
</archive>
- <descriptorRefs>
- <descriptorRef>jar-with-dependencies</descriptorRef>
- </descriptorRefs>
- <finalName>${project.version}-1</finalName>
+ <descriptors>
+ <descriptor>../SikuliX/${sikuli.jartype}</descriptor>
+ </descriptors>
+ <finalName>${sikuli.jarname}-ide</finalName>
</configuration>
<executions>
<execution>
diff --git a/SikuliX/complete.xml b/SikuliX/complete.xml
new file mode 100644
index 0000000..7dbe773
--- /dev/null
+++ b/SikuliX/complete.xml
@@ -0,0 +1,27 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+ <!-- TODO: a jarjar format would be better -->
+ <id>complete</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>/</outputDirectory>
+ <useProjectArtifact>true</useProjectArtifact>
+ <unpack>true</unpack>
+ <scope>runtime</scope>
+ </dependencySet>
+ </dependencySets>
+ <fileSets>
+ <fileSet>
+ <directory>../Libs/src/main/resources</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>${sikuli.uselibs}</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
diff --git a/SikuliX/plain.xml b/SikuliX/plain.xml
new file mode 100644
index 0000000..b40dc2f
--- /dev/null
+++ b/SikuliX/plain.xml
@@ -0,0 +1,18 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+ <!-- TODO: a jarjar format would be better -->
+ <id>complete</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>/</outputDirectory>
+ <useProjectArtifact>true</useProjectArtifact>
+ <unpack>true</unpack>
+ <scope>runtime</scope>
+ </dependencySet>
+ </dependencySets>
+</assembly>
\ No newline at end of file
diff --git a/SikuliX/pom.xml b/SikuliX/pom.xml
index 81eb24b..aea61e4 100755
--- a/SikuliX/pom.xml
+++ b/SikuliX/pom.xml
@@ -15,7 +15,7 @@
<artifactId>SikuliX-POM</artifactId>
<version>1.1.0</version>
- <packaging>pom</packaging>
+ <packaging>pom</packaging>
<url>http://www.sikuli.org</url>
@@ -39,6 +39,8 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<exclude.nativelayer.mac>NativeLayerForMac.java</exclude.nativelayer.mac>
<exclude.nativelayer.null>NativeLayerForNothing</exclude.nativelayer.null>
+ <sikuli.jartype>plain.xml</sikuli.jartype>
+ <sikuli.jarname>${project.version}</sikuli.jarname>
</properties>
<repositories>
@@ -69,13 +71,13 @@
<artifactId>logback-classic</artifactId>
<version>1.0.13</version>
</dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>6.8.7</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>6.8.7</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
<profiles>
<profile>
@@ -86,11 +88,9 @@
</os>
</activation>
<properties>
- <sikuli.uselibs>libs/windows</sikuli.uselibs>
- <sikuli.excludelibs1>**/libs/linux/*</sikuli.excludelibs1>
- <sikuli.excludelibs2>**/libs/mac/*</sikuli.excludelibs2>
+ <sikuli.uselibs>META-INF/libs/windows/**/*</sikuli.uselibs>
<exclude.nativelayer>${exclude.nativelayer.mac}</exclude.nativelayer>
- </properties>
+ </properties>
</profile>
<profile>
<id>Unix</id>
@@ -100,9 +100,7 @@
</os>
</activation>
<properties>
- <sikuli.uselibs>libs/linux</sikuli.uselibs>
- <sikuli.excludelibs1>**/libs/windows/*</sikuli.excludelibs1>
- <sikuli.excludelibs2>**/libs/mac/*</sikuli.excludelibs2>
+ <sikuli.uselibs>META-INF/libs/linux/**/*</sikuli.uselibs>
<exclude.nativelayer>${exclude.nativelayer.mac}</exclude.nativelayer>
</properties>
</profile>
@@ -114,14 +112,54 @@
</os>
</activation>
<properties>
- <sikuli.uselibs>libs/mac</sikuli.uselibs>
- <sikuli.excludelibs1>**/libs/windows/*</sikuli.excludelibs1>
- <sikuli.excludelibs2>**/libs/linux/*</sikuli.excludelibs2>
+ <sikuli.uselibs>META-INF/libs/mac/**/*</sikuli.uselibs>
<exclude.nativelayer>${exclude.nativelayer.null}</exclude.nativelayer>
</properties>
</profile>
+ <profile>
+ <id>withLibs</id>
+ <activation>
+ <activeByDefault>no</activeByDefault>
+ </activation>
+ <properties>
+ <sikuli.jartype>complete.xml</sikuli.jartype>
+ <sikuli.jarname>sikuli</sikuli.jarname>
+ </properties>
+ </profile>
+ <profile>
+ <id>withAllLibs</id>
+ <activation>
+ <activeByDefault>no</activeByDefault>
+ </activation>
+ <properties>
+ <sikuli.jarname>sikuli</sikuli.jarname>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.sikuli</groupId>
+ <artifactId>SikuliX-Libs</artifactId>
+ <version>1.1.0</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>withOCR</id>
+ <activation>
+ <activeByDefault>no</activeByDefault>
+ </activation>
+ <properties>
+ <sikuli.jarname>sikuli</sikuli.jarname>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.sikuli</groupId>
+ <artifactId>SikuliX-Tesseract</artifactId>
+ <version>1.1.0</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
-
+
<build>
<plugins>
<plugin>
--
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