Skip to content

Commit 31365cf

Browse files
bourgeslbourgesl
committed
added fake jmmc-tools module to make a single big jar for all tools
1 parent 85e4dc0 commit 31365cf

16 files changed

+253
-14
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,5 @@ smprun/
1515
smptest/
1616
oiexplorer-existdb/
1717
exist/
18+
jmmc-tools/target/
1819

‎README.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,10 @@ bash build_OImaging-srv.sh
7979
- run AppLauncher GUI:
8080
bash run_AppLauncher-gui.sh
8181

82+
5. Run Tools from a single package (jar):
83+
cd jmmc-tools
84+
use run_... scripts !
85+
8286

8387
Enjoy all JMMC tools !
8488

‎build_gui.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ cd -
88

99
# Build all modules (skip test)
1010
mvn process-resources
11-
mvn -Djarsigner.skip=true -Dmaven.javadoc.skip=true -Dmaven.test.skip=true clean install
11+
mvn -Djarsigner.skip=true -Dmaven.javadoc.skip=true -Dmaven.test.skip=true verify
1212

‎get_modules.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,12 @@ svn --username anonymous checkout https://svn.jmmc.fr/jmmc-sw/AppLauncher/trunk/
5656

5757

5858
# oidb deps
59-
svn --username anonymous checkout https://svn.jmmc.fr/jmmc-sw/oiTools/trunk/oiexplorer-existdb
59+
# svn --username anonymous checkout https://svn.jmmc.fr/jmmc-sw/oiTools/trunk/oiexplorer-existdb
6060

6161
# oidb
62-
svn --username anonymous checkout https://svn.jmmc.fr/jmmc-web/trunk/exist
62+
# svn --username anonymous checkout https://svn.jmmc.fr/jmmc-web/trunk/exist
6363

64-
cd exist
65-
bash ./get_deps.sh
66-
cd ..
64+
# cd exist
65+
# bash ./get_deps.sh
66+
# cd ..
6767

‎jmmc-tools/assembly-jar-with-deps.xml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
4+
5+
<!-- derived from jar-with-dependencies to hack LogbackConfiguration.xml -->
6+
<id>jar-with-dependencies</id>
7+
<formats>
8+
<format>jar</format>
9+
</formats>
10+
<includeBaseDirectory>false</includeBaseDirectory>
11+
<dependencySets>
12+
<dependencySet>
13+
<outputDirectory>/</outputDirectory>
14+
<useProjectArtifact>true</useProjectArtifact>
15+
<unpack>true</unpack>
16+
<unpackOptions>
17+
<excludes>
18+
<exclude>LogbackConfiguration.xml</exclude>
19+
</excludes>
20+
</unpackOptions>
21+
<scope>runtime</scope>
22+
</dependencySet>
23+
</dependencySets>
24+
<files>
25+
<file>
26+
<source>src/main/resources/LogbackConfiguration.xml</source>
27+
<outputDirectory></outputDirectory>
28+
<filtered>false</filtered>
29+
</file>
30+
</files>
31+
</assembly>

‎jmmc-tools/pom.xml‎

Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,109 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2+
<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">
3+
4+
<modelVersion>4.0.0</modelVersion>
5+
6+
<!-- please install first parent pom from jMCS/parent-pom directory -->
7+
<parent>
8+
<groupId>fr.jmmc</groupId>
9+
<artifactId>jmmc</artifactId>
10+
<version>TRUNK</version>
11+
<relativePath />
12+
</parent>
13+
14+
<groupId>fr.jmmc</groupId>
15+
<artifactId>jmmc-tools</artifactId>
16+
<version>TRUNK</version>
17+
18+
<packaging>jar</packaging>
19+
<name>JmmcTools</name>
20+
21+
<properties>
22+
<!-- do make assembly -->
23+
<assembly.skipAssembly>false</assembly.skipAssembly>
24+
<mdep.skip>true</mdep.skip>
25+
26+
<!-- disable tests (fest fails for now) -->
27+
<maven.test.skip>true</maven.test.skip>
28+
</properties>
29+
30+
<build>
31+
<plugins>
32+
<plugin>
33+
<groupId>org.apache.maven.plugins</groupId>
34+
<artifactId>maven-assembly-plugin</artifactId>
35+
<executions>
36+
<execution>
37+
<id>make-assembly</id> <!-- this corresponds to default JMMC build -->
38+
<configuration>
39+
<skipAssembly>true</skipAssembly>
40+
</configuration>
41+
</execution>
42+
<execution>
43+
<id>assembly-jmmc</id>
44+
<phase>package</phase>
45+
<goals>
46+
<goal>single</goal>
47+
</goals>
48+
<configuration>
49+
<descriptors>
50+
<descriptor>./assembly-jar-with-deps.xml</descriptor>
51+
</descriptors>
52+
<archive>
53+
<manifestFile>target/classes/META-INF/MANIFEST.MF</manifestFile>
54+
</archive>
55+
</configuration>
56+
</execution>
57+
</executions>
58+
</plugin>
59+
</plugins>
60+
</build>
61+
62+
<dependencies>
63+
64+
<!-- use latest jmcs library -->
65+
<dependency>
66+
<groupId>fr.jmmc.jmcs</groupId>
67+
<artifactId>jmcs</artifactId>
68+
<version>TRUNK</version>
69+
</dependency>
70+
71+
<dependency>
72+
<groupId>fr.jmmc.aspro</groupId>
73+
<artifactId>aspro2</artifactId>
74+
<version>TRUNK</version>
75+
</dependency>
76+
77+
<dependency>
78+
<groupId>fr.jmmc.sclgui</groupId>
79+
<artifactId>sclgui</artifactId>
80+
<version>TRUNK</version>
81+
</dependency>
82+
83+
<dependency>
84+
<groupId>fr.jmmc.oiexplorer</groupId>
85+
<artifactId>oiexplorer</artifactId>
86+
<version>TRUNK</version>
87+
</dependency>
88+
89+
<dependency>
90+
<groupId>fr.jmmc.mfgui</groupId>
91+
<artifactId>mfgui</artifactId>
92+
<version>TRUNK</version>
93+
</dependency>
94+
95+
<dependency>
96+
<groupId>fr.jmmc.oimaging</groupId>
97+
<artifactId>oimaging</artifactId>
98+
<version>TRUNK</version>
99+
</dependency>
100+
101+
<dependency>
102+
<groupId>fr.jmmc.smprun</groupId>
103+
<artifactId>smprun</artifactId>
104+
<version>TRUNK</version>
105+
</dependency>
106+
107+
</dependencies>
108+
109+
</project>

‎jmmc-tools/run.sh‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#!/bin/bash
2+
3+
echo "JAVA_OPTS: $JAVA_OPTS"
4+
5+
DIR="target"
6+
7+
java $JAVA_OPTS -cp $DIR/jmmc-tools-TRUNK-jar-with-dependencies.jar $1 $2 $3
8+

‎jmmc-tools/run_AppLauncher-gui.sh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/bin/bash
2+
3+
bash run.sh fr.jmmc.smprun.AppLauncher
4+

‎jmmc-tools/run_Aspro2-gui.sh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/bin/bash
2+
3+
bash run.sh fr.jmmc.aspro.Aspro2
4+

‎jmmc-tools/run_LITpro-gui.sh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/bin/bash
2+
3+
bash run.sh fr.jmmc.mf.LITpro
4+

0 commit comments

Comments
 (0)