Skip to content

Commit 08a835b

Browse files
ochafikochafik
committed
Moved to next snapshots for JNAerator (0.11-SNAPSHOT), BridJ (0.6.2-SNAPSHOT) and JavaCL (1.0-SNAPSHOT)
Added OSGi projects for BridJ and JavaCL (issue #283)
1 parent c0c1590 commit 08a835b

File tree

98 files changed

+353
-10584
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+353
-10584
lines changed

‎libraries/BridJ-OSGi/pom.xml‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
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/maven-v4_0_0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<groupId>com.nativelibs4java</groupId>
5+
<artifactId>bridj-osgi</artifactId>
6+
<name>BridJ OSGi Bundle</name>
7+
<url>http://code.google.com/p/bridj/</url>
8+
<version>0.6.2-SNAPSHOT</version>
9+
<packaging>bundle</packaging>
10+
11+
<parent>
12+
<groupId>com.nativelibs4java</groupId>
13+
<artifactId>nativelibs4java-parent</artifactId>
14+
<version>1.8-SNAPSHOT</version>
15+
<relativePath>..</relativePath>
16+
</parent>
17+
18+
<dependencies>
19+
<dependency>
20+
<groupId>com.nativelibs4java</groupId>
21+
<artifactId>bridj</artifactId>
22+
<version>0.6.2-SNAPSHOT</version>
23+
</dependency>
24+
<dependency>
25+
<groupId>org.osgi</groupId>
26+
<artifactId>org.osgi.core</artifactId>
27+
<version>4.3.0</version>
28+
<scope>provided</scope>
29+
</dependency>
30+
31+
</dependencies>
32+
33+
<build>
34+
<plugins>
35+
<plugin>
36+
<groupId>org.apache.felix</groupId>
37+
<artifactId>maven-bundle-plugin</artifactId>
38+
<version>2.3.7</version>
39+
<extensions>true</extensions>
40+
<configuration>
41+
<instructions>
42+
<Bundle-SymbolicName>${pom.groupId}.${pom.artifactId}</Bundle-SymbolicName>
43+
<Bundle-Name>${pom.name}</Bundle-Name>
44+
<Bundle-Version>${pom.version}</Bundle-Version>
45+
<Bundle-Activator>
46+
org.bridj.OSGiBundleActivator
47+
</Bundle-Activator>
48+
<Private-Package>
49+
org.bridj.relocated.*
50+
</Private-Package>
51+
<Import-Package>
52+
org.osgi.framework
53+
</Import-Package>
54+
<Export-Package>
55+
org.bridj,
56+
org.bridj.ann,
57+
org.bridj.cpp,
58+
org.bridj.cpp.com,
59+
org.bridj.cpp.com.shell,
60+
org.bridj.demangling,
61+
org.bridj.jawt,
62+
org.bridj.objc,
63+
org.bridj.dyncall,
64+
org.bridj.util
65+
</Export-Package>
66+
</instructions>
67+
</configuration>
68+
</plugin>
69+
</plugins>
70+
</build>
71+
72+
</project>
73+
74+
75+
76+

‎libraries/BridJ-OSGi/src/main/java/org/bridj/OSGiBundleActivator.java‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package org.bridj;
2+
3+
import org.osgi.framework.BundleActivator;
4+
import org.osgi.framework.BundleContext;
5+
6+
public class OSGiBundleActivator implements BundleActivator {
7+
8+
public void start(BundleContext bundleContext) {
9+
//System.out.println("Starting BridJ");
10+
}
11+
12+
public void stop(BundleContext bundleContext) {
13+
//System.out.println("Stopping BridJ");
14+
}
15+
}

‎libraries/BridJ/pom.xml‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,17 @@
55
<artifactId>bridj</artifactId>
66
<name>BridJ (NativeLibs4Java C/C++ Interop Layer)</name>
77
<url>http://code.google.com/p/bridj/</url>
8-
<version>0.6.1</version>
8+
<version>0.6.2-SNAPSHOT</version>
99
<packaging>jar</packaging>
1010

1111
<properties>
12-
<osgiBundleVersion>0.6.1</osgiBundleVersion>
13-
<versionSpecificSubPackage>v0_6_1</versionSpecificSubPackage>
14-
<exportedPackages>org.bridj,org.bridj.ann,org.bridj.cpp,org.bridj.cpp.com,org.bridj.cpp.com.shell,org.bridj.demangling,org.bridj.jawt,org.bridj.objc,org.bridj.util</exportedPackages>
12+
<versionSpecificSubPackage>v0_6_2</versionSpecificSubPackage>
1513
</properties>
1614

1715
<parent>
1816
<groupId>com.nativelibs4java</groupId>
1917
<artifactId>nativelibs4java-parent</artifactId>
20-
<version>1.7</version>
18+
<version>1.8-SNAPSHOT</version>
2119
<relativePath>..</relativePath>
2220
</parent>
2321

@@ -54,7 +52,6 @@
5452
<version>1.7</version>
5553
</dependency>
5654

57-
5855
</dependencies>
5956

6057
<build>
@@ -121,6 +118,7 @@
121118
<filter>
122119
<artifact>com.nativelibs4java:bridj</artifact>
123120
<excludes>
121+
<exclude>org/bridj/Android**</exclude>
124122
<exclude>org/bridj/cpp/**</exclude>
125123
<exclude>org/bridj/objc/**</exclude>
126124
<exclude>org/bridj/cs/**</exclude>
@@ -159,6 +157,7 @@
159157
<filter>
160158
<artifact>com.nativelibs4java:bridj</artifact>
161159
<excludes>
160+
<exclude>org/bridj/Android**</exclude>
162161
<exclude>org/bridj/cpp/com/**</exclude>
163162
<exclude>org/bridj/cpp/mfc/**</exclude>
164163
<exclude>org/bridj/cs/**</exclude>
@@ -200,6 +199,7 @@
200199
<filter>
201200
<artifact>com.nativelibs4java:bridj</artifact>
202201
<excludes>
202+
<exclude>org/bridj/Android**</exclude>
203203
<exclude>org/bridj/cpp/com/**</exclude>
204204
<exclude>org/bridj/cpp/mfc/**</exclude>
205205
<exclude>org/bridj/cs/**</exclude>
@@ -241,6 +241,7 @@
241241
<filter>
242242
<artifact>com.nativelibs4java:bridj</artifact>
243243
<excludes>
244+
<exclude>org/bridj/Android**</exclude>
244245
<exclude>org/bridj/objc/**</exclude>
245246
<exclude>org/bridj/lib/linux_*/**</exclude>
246247
<exclude>org/bridj/lib/android_*/**</exclude>
@@ -281,6 +282,7 @@
281282
<filter>
282283
<artifact>com.nativelibs4java:bridj</artifact>
283284
<excludes>
285+
<exclude>org/bridj/Android**</exclude>
284286
<exclude>org/bridj/cpp/com/**</exclude>
285287
<exclude>org/bridj/cpp/mfc/**</exclude>
286288
<exclude>org/bridj/cs/**</exclude>
@@ -319,6 +321,7 @@
319321
<filter>
320322
<artifact>com.nativelibs4java:bridj</artifact>
321323
<excludes>
324+
<exclude>org/bridj/Android**</exclude>
322325
<exclude>org/bridj/cpp/com/**</exclude>
323326
<exclude>org/bridj/cpp/mfc/**</exclude>
324327
<exclude>org/bridj/objc/**</exclude>
@@ -405,6 +408,7 @@
405408
<filter>
406409
<artifact>com.nativelibs4java:bridj</artifact>
407410
<excludes>
411+
<exclude>org/bridj/Android**</exclude>
408412
<exclude>org/bridj/lib/android_*/**</exclude>
409413
<exclude>org/bridj/lib/iphoneos_*/**</exclude>
410414
<exclude>lib/armeabi/**</exclude>

‎libraries/DirectX/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<parent>
1212
<groupId>com.nativelibs4java</groupId>
1313
<artifactId>nativelibs4java-parent</artifactId>
14-
<version>1.7</version>
14+
<version>1.8-SNAPSHOT</version>
1515
<relativePath>..</relativePath>
1616
</parent>
1717

‎libraries/FFMpeg/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<parent>
1212
<groupId>com.nativelibs4java</groupId>
1313
<artifactId>nativelibs4java-parent</artifactId>
14-
<version>1.7</version>
14+
<version>1.8-SNAPSHOT</version>
1515
<relativePath>..</relativePath>
1616
</parent>
1717

‎libraries/IdleTime/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
<url>http://code.google.com/p/nativelibs4java/wiki/Runtime</url>
77
<groupId>com.nativelibs4java</groupId>
88
<artifactId>idletime</artifactId>
9-
<version>0.6</version>
9+
<version>0.7-SNAPSHOT</version>
1010
<packaging>jar</packaging>
1111

1212
<parent>
1313
<groupId>com.nativelibs4java</groupId>
1414
<artifactId>nativelibs4java-parent</artifactId>
15-
<version>1.7</version>
15+
<version>1.8-SNAPSHOT</version>
1616
<relativePath>..</relativePath>
1717
</parent>
1818

‎libraries/InteropIntegration/VersionSpecificBridJ/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,21 @@
44
<groupId>com.nativelibs4java</groupId>
55
<artifactId>bridj-version-specific-tests</artifactId>
66
<name>BridJ Version-Specific Tests</name>
7-
<version>0.6.1</version>
7+
<version>0.6.2-SNAPSHOT</version>
88
<packaging>jar</packaging>
99

1010
<parent>
1111
<groupId>com.nativelibs4java</groupId>
1212
<artifactId>nativelibs4java-parent</artifactId>
13-
<version>1.7</version>
13+
<version>1.8-SNAPSHOT</version>
1414
<relativePath>../..</relativePath>
1515
</parent>
1616

1717
<dependencies>
1818
<dependency>
1919
<groupId>com.nativelibs4java</groupId>
2020
<artifactId>bridj</artifactId>
21-
<version>0.6.1</version>
21+
<version>0.6.2-SNAPSHOT</version>
2222
<classifier>version-specific-packages</classifier>
2323
</dependency>
2424
</dependencies>

‎libraries/InteropIntegration/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
<artifactId>interop-integration-root</artifactId>
66
<packaging>pom</packaging>
77
<name>Interop Integration Root</name>
8-
<version>0.6.1</version>
8+
<version>0.6.2-SNAPSHOT</version>
99

1010
<parent>
1111
<groupId>com.nativelibs4java</groupId>
1212
<artifactId>nativelibs4java-parent</artifactId>
13-
<version>1.7</version>
13+
<version>1.8-SNAPSHOT</version>
1414
<relativePath>..</relativePath>
1515
</parent>
1616

‎libraries/JarShrinker/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<artifactId>jarshrinker</artifactId>
77
<name>JarShrinker</name>
88
<url>http://code.google.com/p/nativelibs4java/wiki/Runtime</url>
9-
<version>0.6</version>
9+
<version>0.7-SNAPSHOT</version>
1010
<packaging>jar</packaging>
1111

1212
<properties>
@@ -17,7 +17,7 @@
1717
<parent>
1818
<groupId>com.nativelibs4java</groupId>
1919
<artifactId>nativelibs4java-parent</artifactId>
20-
<version>1.7</version>
20+
<version>1.8-SNAPSHOT</version>
2121
<relativePath>..</relativePath>
2222
</parent>
2323

‎libraries/Mono/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<parent>
1313
<groupId>com.nativelibs4java</groupId>
1414
<artifactId>nativelibs4java-parent</artifactId>
15-
<version>1.7</version>
15+
<version>1.8-SNAPSHOT</version>
1616
<relativePath>..</relativePath>
1717
</parent>
1818

0 commit comments

Comments
 (0)