[sikuli] 249/385: seems to be a solution for the fat jars

[Gilles Filippini]

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 e411f58a1455d6f10ffc85719b0b66fc757de50a
Author: Raimund Hocke <rmhdevelop at me.com>
Date:   Fri Feb 21 20:12:12 2014 +0100

    seems to be a solution for the fat jars
---
 JythonFat/pom.xml | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 collectJars       | 11 ----------
 pom.xml           |  1 +
 3 files changed, 64 insertions(+), 11 deletions(-)

diff --git a/JythonFat/pom.xml b/JythonFat/pom.xml
new file mode 100644
index 0000000..2393e1e
--- /dev/null
+++ b/JythonFat/pom.xml
@@ -0,0 +1,63 @@
+<?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.
+  *
+  * kelthuzad, 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-JythonFat</artifactId>
+  <name>SikuliX-JythonFat</name>
+  <version>1.1.0</version>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.sikuli</groupId>
+      <artifactId>SikuliX-Jython</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.python</groupId>
+      <artifactId>jython-standalone</artifactId>
+      <version>2.7-b1</version>
+    </dependency>
+  </dependencies>
+  
+	<build>
+    <defaultGoal>clean package</defaultGoal>
+		<plugins>
+			<plugin>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<version>2.4</version>
+				<configuration>
+					<descriptors>
+						<descriptor>../${sikuli.jartype}</descriptor>
+					</descriptors>
+					<finalName>${sikuli.jarname}-4</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/collectJars b/collectJars
index eebcbe1..444a3a9 100755
--- a/collectJars
+++ b/collectJars
@@ -49,17 +49,6 @@ mvn -f Basics/setup* >>$log
 cp Basics/target-setup/sikulixsetup*.jar $dist/sikulixsetup-$mversion.jar
 
 if [ "$1" != "setup" ]; then
-  # ---------- Jython
-  echo --- Jython timestamp
-  echo --- BUILD Jython timestamp >>$log
-  cd $base/$jython
-  src=$base/$jython/src/main/java/org/sikuli/scriptrunner/JythonScriptRunner.java
-  out=$base/$jython/src/main/java/org/sikuli/scriptrunner/JythonScriptRunnerX.java
-  xdd=`date`
-  sed "s/##--##.*##--##/##--##$xdd##--##/" $src >$out
-  mv -f $out $src
-  mvn clean install >>$log
-  
   # ----------- API
   echo --- make API
   cd $base
diff --git a/pom.xml b/pom.xml
index 3d63283..834af27 100755
--- a/pom.xml
+++ b/pom.xml
@@ -224,6 +224,7 @@
 		<module>Natives</module>
 		<module>Basics</module>
 		<module>Jython</module>
+		<module>JythonFat</module>
 		<module>JRuby</module>
 		<module>API</module>
 		<module>IDE</module>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sikuli.git