Skip to content

Commit 9f748ef

Browse files
ochafikochafik
committed
Fix CRLF
1 parent 4cfc256 commit 9f748ef

File tree

17 files changed

+1866
-1866
lines changed

17 files changed

+1866
-1866
lines changed

‎Contributions/Kazo Csaba/CreateBinaryProgram - issue 30.diff‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
Index: OpenCL/Core/src/main/java/com/nativelibs4java/opencl/CLContext.java
2-
===================================================================
3-
--- OpenCL/Core/src/main/java/com/nativelibs4java/opencl/CLContext.java (revision 993)
4-
+++ OpenCL/Core/src/main/java/com/nativelibs4java/opencl/CLContext.java (working copy)
5-
@@ -64,6 +64,7 @@
1+
Index: OpenCL/Core/src/main/java/com/nativelibs4java/opencl/CLContext.java
2+
===================================================================
3+
--- OpenCL/Core/src/main/java/com/nativelibs4java/opencl/CLContext.java (revision 993)
4+
+++ OpenCL/Core/src/main/java/com/nativelibs4java/opencl/CLContext.java (working copy)
5+
@@ -64,6 +64,7 @@
66
import com.sun.jna.Platform;
77
import com.sun.jna.Pointer;
88
import com.sun.jna.ptr.IntByReference;
99
+import java.util.Map;
1010

1111
/**
1212
* OpenCL context.<br/>
13-
@@ -189,6 +190,10 @@
13+
@@ -189,6 +190,10 @@
1414
return program;
1515
}
1616

@@ -21,19 +21,19 @@ Index: OpenCL/Core/src/main/java/com/nativelibs4java/opencl/CLContext.java
2121
//cl_queue queue;
2222
@Override
2323
protected void clear() {
24-
Index: OpenCL/Core/src/main/java/com/nativelibs4java/opencl/CLProgram.java
25-
===================================================================
26-
--- OpenCL/Core/src/main/java/com/nativelibs4java/opencl/CLProgram.java (revision 993)
27-
+++ OpenCL/Core/src/main/java/com/nativelibs4java/opencl/CLProgram.java (working copy)
28-
@@ -47,6 +47,7 @@
24+
Index: OpenCL/Core/src/main/java/com/nativelibs4java/opencl/CLProgram.java
25+
===================================================================
26+
--- OpenCL/Core/src/main/java/com/nativelibs4java/opencl/CLProgram.java (revision 993)
27+
+++ OpenCL/Core/src/main/java/com/nativelibs4java/opencl/CLProgram.java (working copy)
28+
@@ -47,6 +47,7 @@
2929
import com.sun.jna.Native;
3030
import com.sun.jna.Pointer;
3131
import com.sun.jna.ptr.IntByReference;
3232
+import com.sun.jna.ptr.PointerByReference;
3333

3434
/**
3535
* OpenCL program.<br/>
36-
@@ -83,7 +84,30 @@
36+
@@ -83,7 +84,30 @@
3737
this.context = context;
3838
this.devices = devices == null || devices.length == 0 ? context.getDevices() : devices;
3939
}
@@ -64,11 +64,11 @@ Index: OpenCL/Core/src/main/java/com/nativelibs4java/opencl/CLProgram.java
6464
List<String> sources = new ArrayList<String>();
6565
Map<CLDevice, cl_program> programByDevice = new HashMap<CLDevice, cl_program>();
6666

67-
Index: OpenCL/OpenCL4Java/src/main/java/com/nativelibs4java/opencl/library/OpenCLLibrary.java
68-
===================================================================
69-
--- OpenCL/OpenCL4Java/src/main/java/com/nativelibs4java/opencl/library/OpenCLLibrary.java (revision 993)
70-
+++ OpenCL/OpenCL4Java/src/main/java/com/nativelibs4java/opencl/library/OpenCLLibrary.java (working copy)
71-
@@ -595,6 +595,11 @@
67+
Index: OpenCL/OpenCL4Java/src/main/java/com/nativelibs4java/opencl/library/OpenCLLibrary.java
68+
===================================================================
69+
--- OpenCL/OpenCL4Java/src/main/java/com/nativelibs4java/opencl/library/OpenCLLibrary.java (revision 993)
70+
+++ OpenCL/OpenCL4Java/src/main/java/com/nativelibs4java/opencl/library/OpenCLLibrary.java (working copy)
71+
@@ -595,6 +595,11 @@
7272
* Original signature : <code>cl_program clCreateProgramWithBinary(cl_context, cl_uint, const cl_device_id*, const size_t*, const unsigned char**, cl_int*, cl_int*)</code><br>
7373
* @see <a href="http://www.khronos.org/opencl/sdk/1.0/docs/man/xhtml/clCreateProgramWithBinary.html">Khronos Documentation for clCreateProgramWithBinary</a>
7474
*/

‎Core/src/main/jnlp/HardwareReport.jnlp‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<jnlp spec="1.0+"
3-
codebase="http://nativelibs4java.sourceforge.net/webstart/OpenCL/"
4-
href="HardwareReport.jnlp"
5-
>
6-
<information>
7-
<title>JavaCL HardwareReport</title>
8-
<vendor>Olivier Chafik</vendor>
9-
<homepage href="http://code.google.com/p/nativelibs4java/wiki/OpenCL" />
10-
<description>JavaCL HardwareReport</description>
11-
<description kind='tooltip'>JavaCL HardwareReport</description>
12-
<offline-allowed/>
13-
<shortcut online="false">
14-
<desktop/>
15-
<menu submenu="JavaCL (OpenCL for Java)"/>
16-
</shortcut>
17-
</information>
18-
<security>
19-
<all-permissions/>
20-
</security>
21-
<update check="always" policy="prompt-update"/>
22-
<resources>
23-
<extension name="JavaCL" href="http://nativelibs4java.sourceforge.net/webstart/OpenCL/JavaCL.jnlp"/>
24-
<jar href="http://nativelibs4java.sourceforge.net/maven/com/nativelibs4java/javacl-demos/1.0-SNAPSHOT/javacl-demos-1.0-SNAPSHOT.jar"/>
25-
<j2se version="1.6+"/>
26-
</resources>
27-
<application-desc
28-
main-class="com.nativelibs4java.opencl.demos.hardware.HardwareReport"
29-
/>
30-
</jnlp>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<jnlp spec="1.0+"
3+
codebase="http://nativelibs4java.sourceforge.net/webstart/OpenCL/"
4+
href="HardwareReport.jnlp"
5+
>
6+
<information>
7+
<title>JavaCL HardwareReport</title>
8+
<vendor>Olivier Chafik</vendor>
9+
<homepage href="http://code.google.com/p/nativelibs4java/wiki/OpenCL" />
10+
<description>JavaCL HardwareReport</description>
11+
<description kind='tooltip'>JavaCL HardwareReport</description>
12+
<offline-allowed/>
13+
<shortcut online="false">
14+
<desktop/>
15+
<menu submenu="JavaCL (OpenCL for Java)"/>
16+
</shortcut>
17+
</information>
18+
<security>
19+
<all-permissions/>
20+
</security>
21+
<update check="always" policy="prompt-update"/>
22+
<resources>
23+
<extension name="JavaCL" href="http://nativelibs4java.sourceforge.net/webstart/OpenCL/JavaCL.jnlp"/>
24+
<jar href="http://nativelibs4java.sourceforge.net/maven/com/nativelibs4java/javacl-demos/1.0-SNAPSHOT/javacl-demos-1.0-SNAPSHOT.jar"/>
25+
<j2se version="1.6+"/>
26+
</resources>
27+
<application-desc
28+
main-class="com.nativelibs4java.opencl.demos.hardware.HardwareReport"
29+
/>
30+
</jnlp>

‎Core/src/main/jnlp/JavaCL.jnlp‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<jnlp spec="1.0+"
3-
codebase="http://nativelibs4java.sourceforge.net/webstart/OpenCL/"
4-
href="JavaCL.jnlp"
5-
>
6-
<information>
7-
<title>JavaCL</title>
8-
<vendor>Olivier Chafik</vendor>
9-
<homepage href="http://code.google.com/p/javacl/" />
10-
<description>Object-Oriented OpenCL Library for Java</description>
11-
</information>
12-
<security>
13-
<all-permissions/>
14-
</security>
15-
<resources>
16-
<j2se version="1.5+"/>
17-
<extension name="OpenCL4Java" href="http://nativelibs4java.sourceforge.net/webstart/OpenCL/OpenCL4Java.jnlp"/>
18-
<jar href="http://nativelibs4java.sourceforge.net/maven/com/nativelibs4java/javacl/1.0-SNAPSHOT/javacl-1.0-SNAPSHOT.jar"/>
19-
<jar href="http://nativelibs4java.sourceforge.net/maven/com/nativelibs4java/javacl-utils/1.0-SNAPSHOT/javacl-utils-1.0-SNAPSHOT.jar"/>
20-
</resources>
21-
22-
<component-desc/>
23-
</jnlp>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<jnlp spec="1.0+"
3+
codebase="http://nativelibs4java.sourceforge.net/webstart/OpenCL/"
4+
href="JavaCL.jnlp"
5+
>
6+
<information>
7+
<title>JavaCL</title>
8+
<vendor>Olivier Chafik</vendor>
9+
<homepage href="http://code.google.com/p/javacl/" />
10+
<description>Object-Oriented OpenCL Library for Java</description>
11+
</information>
12+
<security>
13+
<all-permissions/>
14+
</security>
15+
<resources>
16+
<j2se version="1.5+"/>
17+
<extension name="OpenCL4Java" href="http://nativelibs4java.sourceforge.net/webstart/OpenCL/OpenCL4Java.jnlp"/>
18+
<jar href="http://nativelibs4java.sourceforge.net/maven/com/nativelibs4java/javacl/1.0-SNAPSHOT/javacl-1.0-SNAPSHOT.jar"/>
19+
<jar href="http://nativelibs4java.sourceforge.net/maven/com/nativelibs4java/javacl-utils/1.0-SNAPSHOT/javacl-utils-1.0-SNAPSHOT.jar"/>
20+
</resources>
21+
22+
<component-desc/>
23+
</jnlp>

‎Core/src/main/jnlp/OpenCL4Java.jnlp‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<jnlp spec="1.0+"
3-
codebase="http://nativelibs4java.sourceforge.net/webstart/OpenCL/"
4-
href="OpenCL4Java.jnlp"
5-
>
6-
<information>
7-
<title>OpenCL4Java</title>
8-
<vendor>Olivier Chafik</vendor>
9-
<homepage href="http://code.google.com/p/nativelibs4java/wiki/OpenCL" />
10-
<description>OpenCL bindings for Java</description>
11-
<description kind='tooltip'>OpenCL4Java HardwareReport</description>
12-
</information>
13-
<security>
14-
<all-permissions/>
15-
</security>
16-
<resources>
17-
<j2se version="1.5+"/>
18-
<extension name="JNAeratorRuntime" href="http://jnaerator.sourceforge.net/webstart/JNAerator/JNAeratorRuntime.jnlp"/>
19-
<!--jar href="http://nativelibs4java.sourceforge.net/maven/com/nativelibs4java/scalacl/1.0-SNAPSHOT/scalacl-1.0-SNAPSHOT.jar"/-->
20-
<!--jar href="http://nativelibs4java.sourceforge.net/maven/com/nativelibs4java/javacl/1.0-SNAPSHOT/javacl-1.0-SNAPSHOT.jar"/-->
21-
<jar href="http://nativelibs4java.sourceforge.net/maven/com/nativelibs4java/opencl4java/1.0-SNAPSHOT/opencl4java-1.0-SNAPSHOT.jar"/>
22-
</resources>
23-
24-
<component-desc/>
25-
</jnlp>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<jnlp spec="1.0+"
3+
codebase="http://nativelibs4java.sourceforge.net/webstart/OpenCL/"
4+
href="OpenCL4Java.jnlp"
5+
>
6+
<information>
7+
<title>OpenCL4Java</title>
8+
<vendor>Olivier Chafik</vendor>
9+
<homepage href="http://code.google.com/p/nativelibs4java/wiki/OpenCL" />
10+
<description>OpenCL bindings for Java</description>
11+
<description kind='tooltip'>OpenCL4Java HardwareReport</description>
12+
</information>
13+
<security>
14+
<all-permissions/>
15+
</security>
16+
<resources>
17+
<j2se version="1.5+"/>
18+
<extension name="JNAeratorRuntime" href="http://jnaerator.sourceforge.net/webstart/JNAerator/JNAeratorRuntime.jnlp"/>
19+
<!--jar href="http://nativelibs4java.sourceforge.net/maven/com/nativelibs4java/scalacl/1.0-SNAPSHOT/scalacl-1.0-SNAPSHOT.jar"/-->
20+
<!--jar href="http://nativelibs4java.sourceforge.net/maven/com/nativelibs4java/javacl/1.0-SNAPSHOT/javacl-1.0-SNAPSHOT.jar"/-->
21+
<jar href="http://nativelibs4java.sourceforge.net/maven/com/nativelibs4java/opencl4java/1.0-SNAPSHOT/opencl4java-1.0-SNAPSHOT.jar"/>
22+
</resources>
23+
24+
<component-desc/>
25+
</jnlp>

‎Core/src/main/jnlp/ScalaCL.jnlp‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<jnlp spec="1.0+"
3-
codebase="http://nativelibs4java.sourceforge.net/webstart/OpenCL/"
4-
href="ScalaCL.jnlp"
5-
>
6-
<information>
7-
<title>ScalaCL</title>
8-
<vendor>Olivier Chafik</vendor>
9-
<homepage href="http://code.google.com/p/scalacl" />
10-
<description>OpenCL for Scala: natural DSL and Object-Oriented API</description>
11-
</information>
12-
<security>
13-
<all-permissions/>
14-
</security>
15-
<resources>
16-
<j2se version="1.5+"/>
17-
<extension name="JavaCL" href="http://nativelibs4java.sourceforge.net/webstart/OpenCL/JavaCL.jnlp"/>
18-
<jar href="http://nativelibs4java.sourceforge.net/maven/com/nativelibs4java/scalacl/1.0-SNAPSHOT/scalacl-1.0-SNAPSHOT.jar"/>
19-
</resources>
20-
21-
<component-desc/>
22-
</jnlp>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<jnlp spec="1.0+"
3+
codebase="http://nativelibs4java.sourceforge.net/webstart/OpenCL/"
4+
href="ScalaCL.jnlp"
5+
>
6+
<information>
7+
<title>ScalaCL</title>
8+
<vendor>Olivier Chafik</vendor>
9+
<homepage href="http://code.google.com/p/scalacl" />
10+
<description>OpenCL for Scala: natural DSL and Object-Oriented API</description>
11+
</information>
12+
<security>
13+
<all-permissions/>
14+
</security>
15+
<resources>
16+
<j2se version="1.5+"/>
17+
<extension name="JavaCL" href="http://nativelibs4java.sourceforge.net/webstart/OpenCL/JavaCL.jnlp"/>
18+
<jar href="http://nativelibs4java.sourceforge.net/maven/com/nativelibs4java/scalacl/1.0-SNAPSHOT/scalacl-1.0-SNAPSHOT.jar"/>
19+
</resources>
20+
21+
<component-desc/>
22+
</jnlp>

‎Demos/pom.xml‎

Lines changed: 59 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,59 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0"
2-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
4-
<modelVersion>4.0.0</modelVersion>
5-
<groupId>com.nativelibs4java</groupId>
6-
<artifactId>javacl-demos-jna</artifactId>
7-
<name>JavaCL Demos / JNA</name>
8-
<url>http://code.google.com/p/javacl/</url>
9-
<version>1.0-SNAPSHOT</version>
10-
<packaging>jar</packaging>
11-
12-
<parent>
13-
<groupId>com.nativelibs4java</groupId>
14-
<artifactId>javacl-parent-jna</artifactId>
15-
<version>1.0-SNAPSHOT</version>
16-
<relativePath>..</relativePath>
17-
</parent>
18-
19-
<dependencies>
20-
21-
<dependency>
22-
<groupId>com.nativelibs4java</groupId>
23-
<artifactId>javacl-jna</artifactId>
24-
</dependency>
25-
26-
27-
<dependency>
28-
<groupId>org.swinglabs</groupId>
29-
<artifactId>swing-layout</artifactId>
30-
<version>1.0.3</version>
31-
</dependency>
32-
</dependencies>
33-
34-
<build>
35-
<plugins>
36-
37-
<plugin>
38-
<groupId>com.nativelibs4java</groupId>
39-
<artifactId>javacl-generator-jna</artifactId>
40-
<executions>
41-
<execution>
42-
<goals>
43-
<goal>compile</goal>
44-
<!--goal>test-compile</goal-->
45-
</goals>
46-
47-
</execution>
48-
</executions>
49-
</plugin>
50-
51-
</plugins>
52-
</build>
53-
54-
</project>
55-
56-
57-
58-
59-
1+
<project xmlns="http://maven.apache.org/POM/4.0.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
4+
<modelVersion>4.0.0</modelVersion>
5+
<groupId>com.nativelibs4java</groupId>
6+
<artifactId>javacl-demos-jna</artifactId>
7+
<name>JavaCL Demos / JNA</name>
8+
<url>http://code.google.com/p/javacl/</url>
9+
<version>1.0-SNAPSHOT</version>
10+
<packaging>jar</packaging>
11+
12+
<parent>
13+
<groupId>com.nativelibs4java</groupId>
14+
<artifactId>javacl-parent-jna</artifactId>
15+
<version>1.0-SNAPSHOT</version>
16+
<relativePath>..</relativePath>
17+
</parent>
18+
19+
<dependencies>
20+
21+
<dependency>
22+
<groupId>com.nativelibs4java</groupId>
23+
<artifactId>javacl-jna</artifactId>
24+
</dependency>
25+
26+
27+
<dependency>
28+
<groupId>org.swinglabs</groupId>
29+
<artifactId>swing-layout</artifactId>
30+
<version>1.0.3</version>
31+
</dependency>
32+
</dependencies>
33+
34+
<build>
35+
<plugins>
36+
37+
<plugin>
38+
<groupId>com.nativelibs4java</groupId>
39+
<artifactId>javacl-generator-jna</artifactId>
40+
<executions>
41+
<execution>
42+
<goals>
43+
<goal>compile</goal>
44+
<!--goal>test-compile</goal-->
45+
</goals>
46+
47+
</execution>
48+
</executions>
49+
</plugin>
50+
51+
</plugins>
52+
</build>
53+
54+
</project>
55+
56+
57+
58+
59+

0 commit comments

Comments
 (0)