X Tutup
Skip to content

Commit ef75b8f

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 e574df5 commit ef75b8f

Some content is hidden

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

59 files changed

+160
-10469
lines changed

‎Blas/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<parent>
1111
<groupId>com.nativelibs4java</groupId>
1212
<artifactId>javacl-parent</artifactId>
13-
<version>1.0.0-RC2</version>
13+
<version>1.0-SNAPSHOT</version>
1414
<relativePath>..</relativePath>
1515
</parent>
1616

‎Core/pom.xml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,10 @@ For more info, please visit http://code.google.com/p/nativelibs4java/wiki/OpenCL
1717
<parent>
1818
<groupId>com.nativelibs4java</groupId>
1919
<artifactId>javacl-parent</artifactId>
20-
<version>1.0.0-RC2</version>
20+
<version>1.0-SNAPSHOT</version>
2121
<relativePath>..</relativePath>
2222
</parent>
2323

24-
<properties>
25-
<exportedPackages>com.nativelibs4java.opencl,com.nativelibs4java.opencl.util,com.nativelibs4java.opencl.util.fft</exportedPackages>
26-
<packageName>com.nativelibs4java.opencl</packageName>
27-
</properties>
28-
2924
<dependencies>
3025

3126
<dependency>

‎Demos/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>javacl-parent</artifactId>
14-
<version>1.0.0-RC2</version>
14+
<version>1.0-SNAPSHOT</version>
1515
<relativePath>..</relativePath>
1616
</parent>
1717

‎Generator/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>javacl-parent</artifactId>
14-
<version>1.0.0-RC2</version>
14+
<version>1.0-SNAPSHOT</version>
1515
<relativePath>..</relativePath>
1616
</parent>
1717

‎InteractiveImageDemo/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>javacl-parent</artifactId>
14-
<version>1.0.0-RC2</version>
14+
<version>1.0-SNAPSHOT</version>
1515
<relativePath>..</relativePath>
1616
</parent>
1717

‎JavaCL-OSGi/pom.xml‎

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
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>javacl-osgi</artifactId>
6+
<name>JavaCL OSGi Bundle</name>
7+
<url>http://code.google.com/p/javacl/</url>
8+
<version>1.0-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>javacl-shaded</artifactId>
22+
<version>1.0-SNAPSHOT</version>
23+
<!--classifier>shaded</classifier-->
24+
</dependency>
25+
<dependency>
26+
<groupId>org.osgi</groupId>
27+
<artifactId>org.osgi.core</artifactId>
28+
<version>4.3.0</version>
29+
<scope>provided</scope>
30+
</dependency>
31+
32+
</dependencies>
33+
34+
<build>
35+
<plugins>
36+
<plugin>
37+
<groupId>org.apache.felix</groupId>
38+
<artifactId>maven-bundle-plugin</artifactId>
39+
<version>2.3.7</version>
40+
<extensions>true</extensions>
41+
<configuration>
42+
<instructions>
43+
<Bundle-SymbolicName>${pom.groupId}.${pom.artifactId}</Bundle-SymbolicName>
44+
<Bundle-Name>${pom.name}</Bundle-Name>
45+
<Bundle-Version>${pom.version}</Bundle-Version>
46+
<Bundle-Activator>
47+
com.nativelibs4java.opencl.OSGiBundleActivator
48+
</Bundle-Activator>
49+
<Private-Package>
50+
org.bridj.relocated.*
51+
</Private-Package>
52+
<Import-Package>
53+
org.osgi.framework
54+
</Import-Package>
55+
<Export-Package>
56+
com.nativelibs4java.opencl,
57+
com.nativelibs4java.opencl.library,
58+
com.nativelibs4java.opencl.util,
59+
com.nativelibs4java.opencl.util.fft,
60+
com.nativelibs4java.util,
61+
com.ochafik.util.string,
62+
63+
org.bridj,
64+
org.bridj.ann,
65+
org.bridj.cpp,
66+
org.bridj.cpp.com,
67+
org.bridj.cpp.com.shell,
68+
org.bridj.demangling,
69+
org.bridj.jawt,
70+
org.bridj.objc,
71+
org.bridj.dyncall,
72+
org.bridj.util
73+
</Export-Package>
74+
</instructions>
75+
</configuration>
76+
</plugin>
77+
</plugins>
78+
</build>
79+
80+
</project>
81+
82+
83+
84+

‎JavaCL-OSGi/src/main/java/com/nativelibs4java/opencl/OSGiBundleActivator.java‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package com.nativelibs4java.opencl;
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 JavaCL");
10+
}
11+
12+
public void stop(BundleContext bundleContext) {
13+
System.out.println("Stopping JavaCL");
14+
}
15+
}

‎JavaCL-Shaded/pom.xml‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
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>javacl-shaded</artifactId>
6+
<name>JavaCL Shaded</name>
7+
<url>http://code.google.com/p/javacl/</url>
8+
<version>1.0-SNAPSHOT</version>
9+
<packaging>jar</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+
<properties>
19+
<shadedArtifactAttached>false</shadedArtifactAttached>
20+
</properties>
21+
22+
<dependencies>
23+
<dependency>
24+
<groupId>com.nativelibs4java</groupId>
25+
<artifactId>javacl</artifactId>
26+
<version>1.0-SNAPSHOT</version>
27+
</dependency>
28+
29+
</dependencies>
30+
31+
<build>
32+
<plugins>
33+
<plugin>
34+
<groupId>org.apache.maven.plugins</groupId>
35+
<artifactId>maven-shade-plugin</artifactId>
36+
</plugin>
37+
</plugins>
38+
</build>
39+
40+
</project>

‎JavaCL/pom.xml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,10 @@ For more info, please visit http://code.google.com/p/nativelibs4java/wiki/OpenCL
1717
<parent>
1818
<groupId>com.nativelibs4java</groupId>
1919
<artifactId>javacl-parent</artifactId>
20-
<version>1.0.0-RC2</version>
20+
<version>1.0-SNAPSHOT</version>
2121
<relativePath>..</relativePath>
2222
</parent>
2323

24-
<properties>
25-
<exportedPackages>com.nativelibs4java.opencl,com.nativelibs4java.opencl.util,com.nativelibs4java.opencl.util.fft</exportedPackages>
26-
<packageName>com.nativelibs4java.opencl</packageName>
27-
</properties>
28-
2924
<dependencies>
3025

3126
<dependency>

‎LibCL/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<parent>
1616
<groupId>com.nativelibs4java</groupId>
1717
<artifactId>javacl-parent</artifactId>
18-
<version>1.0.0-RC2</version>
18+
<version>1.0-SNAPSHOT</version>
1919
<relativePath>..</relativePath>
2020
</parent>
2121

0 commit comments

Comments
 (0)
X Tutup