[netbeans-opengl-pack~glpack-git:c0a8902b] fixed JOGL2 library deployment
- From: mbien@kenai.com
- To: commits@netbeans-opengl-pack.kenai.com
- Subject: [netbeans-opengl-pack~glpack-git:c0a8902b] fixed JOGL2 library deployment
- Date: Mon, 10 Aug 2009 17:02:34 +0000
Project: netbeans-opengl-pack
Repository: glpack-git
Revision: c0a8902b6bcc7a46fce2eca13c7d9229024aca28
Author: mbien
Date: 2009-08-10 16:58:56 UTC
Link:
Log Message:
------------
fixed JOGL2 library deployment
ensured that jogl1 lagacy projects will continue building by introducing the
compability jogl-project1 module
updated some .gitignore files
Revisions:
----------
c0a8902b6bcc7a46fce2eca13c7d9229024aca28
Modified Paths:
---------------
BUILD_README
beansbinding/.gitignore
gluegen1/build.xml
gluegen1/nbproject/genfiles.properties
gluegen1/nbproject/project.xml
gluegen1/src/com/sun/gluegen/gluegen1/Bundle.properties
jogl-formdesigner-integration/.gitignore
jogl-project/.gitignore
jogl-project/nbproject/project.xml
jogl-project/nbproject/suite.properties
jogl-project/src/net/java/nboglpack/joglproject/Bundle.properties
jogl-project/src/net/java/nboglpack/joglproject/resources/GLUEGEN-RT.xml
jogl-project/src/net/java/nboglpack/joglproject/resources/JOGL.xml
jogl1/.gitignore
jogl1/build.xml
jogl1/nbproject/genfiles.properties
jogl1/src/javax/media/opengl/jogl1/Bundle.properties
native-lib-support/src/net/java/nativelibsupport/NativeLibSupport.java
nbproject/project.properties
Added Paths:
------------
gluegen1/src/com/sun/gluegen/gluegen1/Empty.java
jogl-project1/build.xml
jogl-project1/manifest.mf
jogl-project1/nbproject/build-impl.xml
jogl-project1/nbproject/genfiles.properties
jogl-project1/nbproject/platform.properties
jogl-project1/nbproject/private/platform-private.properties
jogl-project1/nbproject/private/private.xml
jogl-project1/nbproject/project.properties
jogl-project1/nbproject/project.xml
jogl-project1/nbproject/suite.properties
jogl-project1/src/net/java/nboglpack/joglproject/jogl1/Bundle.properties
jogl-project1/src/net/java/nboglpack/joglproject/jogl1/layer.xml
jogl-project1/src/net/java/nboglpack/joglproject/jogl1/resources/GLUEGEN-RT.xml
jogl-project1/src/net/java/nboglpack/joglproject/jogl1/resources/JOGL.xml
Diffs:
------
diff --git a/BUILD_README b/BUILD_README
index 87f56a2..c126030 100644
--- a/BUILD_README
+++ b/BUILD_README
@@ -1,8 +1,14 @@
To build the OpenGL Pack put the following libraries into the ANT path:
-*ant-contrib tasks (http://ant-contrib.sourceforge.net/) ant-contrib.jar
-*vpp tasks (http://vpp.sourceforge.net/) foundrylogic-vpp.jar and
velocity-dep.jar
-*JAXB 2.1.7 (https://jaxb.dev.java.net/) jaxb-xjc.jar
+* ant-contrib tasks (http://ant-contrib.sourceforge.net/) ant-contrib.jar
+* vpp tasks (http://vpp.sourceforge.net/) foundrylogic-vpp.jar and
velocity-dep.jar
+* JAXB 2.1.7 (https://jaxb.dev.java.net/) jaxb-xjc.jar
-the ANT path is configurable via Tools->Options->Miscellaneous->ANT and
don't forget to restart NetBeans
+the NetBeans ANT path is configurable via Tools->Options->Miscellaneous->ANT
+
+The libraries are also available on the project page:
+http://projectkenai.com/projects/netbeans-opengl-pack/downloads/directory/dev
+
+required JDK version:
+1.6
diff --git a/beansbinding/.gitignore b/beansbinding/.gitignore
index 378eac2..14dfe8f 100644
--- a/beansbinding/.gitignore
+++ b/beansbinding/.gitignore
@@ -1 +1,2 @@
build
+nbproject/private
diff --git a/gluegen1/build.xml b/gluegen1/build.xml
index 5ecf3c0..678b8c5 100644
--- a/gluegen1/build.xml
+++ b/gluegen1/build.xml
@@ -30,11 +30,6 @@
<fileset dir="release/gluegen-runtime"
includes="gluegen-rt-natives-*.jar"/>
</foreach>
- <!--copy jars into lib wrapper module ext classpath-->
- <copy todir="release/modules/ext/" overwrite="true">
- <fileset file="release/gluegen-runtime/gluegen-rt.jar"/>
- </copy>
-
</target>
<target name="unzip-natives">
diff --git a/gluegen1/nbproject/genfiles.properties
b/gluegen1/nbproject/genfiles.properties
index c12ccce..842df22 100644
--- a/gluegen1/nbproject/genfiles.properties
+++ b/gluegen1/nbproject/genfiles.properties
@@ -3,6 +3,6 @@ build.xml.script.CRC32=bc332090
build.xml.stylesheet.CRC32=79c3b980@1.28.2.7
# This file is used by a NetBeans-based IDE to track changes in generated
files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never
regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=d31827b2
+nbproject/build-impl.xml.data.CRC32=51760ab8
nbproject/build-impl.xml.script.CRC32=4c388699
nbproject/build-impl.xml.stylesheet.CRC32=261c4bef@1.28.2.7
diff --git a/gluegen1/nbproject/project.xml b/gluegen1/nbproject/project.xml
index f072de0..57b7c70 100644
--- a/gluegen1/nbproject/project.xml
+++ b/gluegen1/nbproject/project.xml
@@ -6,7 +6,9 @@
<code-name-base>com.sun.gluegen.gluegen1</code-name-base>
<suite-component/>
<module-dependencies/>
- <public-packages/>
+ <public-packages>
+ <package>com.sun.gluegen.gluegen1</package>
+ </public-packages>
</data>
</configuration>
</project>
diff --git a/gluegen1/src/com/sun/gluegen/gluegen1/Bundle.properties
b/gluegen1/src/com/sun/gluegen/gluegen1/Bundle.properties
index df188bc..cf752b8 100644
--- a/gluegen1/src/com/sun/gluegen/gluegen1/Bundle.properties
+++ b/gluegen1/src/com/sun/gluegen/gluegen1/Bundle.properties
@@ -1,5 +1,5 @@
OpenIDE-Module-Display-Category=Libraries
OpenIDE-Module-Long-Description=\
GlueGen library wrapper module for maintaining backwards compability
-OpenIDE-Module-Name=GlueGen 1 runtime libraries
+OpenIDE-Module-Name=GlueGen 1 runtime libraries (dummy)
OpenIDE-Module-Short-Description=GlueGen library wrapper module for
maintaining backwards compability
diff --git a/gluegen1/src/com/sun/gluegen/gluegen1/Empty.java
b/gluegen1/src/com/sun/gluegen/gluegen1/Empty.java
new file mode 100644
index 0000000..ceaf292
--- /dev/null
+++ b/gluegen1/src/com/sun/gluegen/gluegen1/Empty.java
@@ -0,0 +1,7 @@
+package com.sun.gluegen.gluegen1;
+
+/**
+ * Empty class as placeholder. It is apparently not possible to declare a
dependency to a module without a class.
+ * @author Michael Bien
+ */
+public class Empty {}
diff --git a/jogl-formdesigner-integration/.gitignore
b/jogl-formdesigner-integration/.gitignore
index 378eac2..14dfe8f 100644
--- a/jogl-formdesigner-integration/.gitignore
+++ b/jogl-formdesigner-integration/.gitignore
@@ -1 +1,2 @@
build
+nbproject/private
diff --git a/jogl-project/.gitignore b/jogl-project/.gitignore
index 92faf78..67ae50f 100644
--- a/jogl-project/.gitignore
+++ b/jogl-project/.gitignore
@@ -1,2 +1,3 @@
build
-release/*
+release
+nbproject/private
diff --git a/jogl-project/nbproject/project.xml
b/jogl-project/nbproject/project.xml
index aa04cc4..c837d0a 100644
--- a/jogl-project/nbproject/project.xml
+++ b/jogl-project/nbproject/project.xml
@@ -11,7 +11,7 @@
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
- <specification-version>1.0.6</specification-version>
+ <specification-version>2.0.5</specification-version>
</run-dependency>
</dependency>
<dependency>
@@ -19,7 +19,7 @@
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
-
<specification-version>1.1.1.4</specification-version>
+ <specification-version>2.0.5</specification-version>
</run-dependency>
</dependency>
<dependency>
diff --git a/jogl-project/nbproject/suite.properties
b/jogl-project/nbproject/suite.properties
index 364e160..29d7cc9 100644
--- a/jogl-project/nbproject/suite.properties
+++ b/jogl-project/nbproject/suite.properties
@@ -1 +1 @@
-suite.dir=${basedir}/..
+suite.dir=${basedir}/..
diff --git
a/jogl-project/src/net/java/nboglpack/joglproject/Bundle.properties
b/jogl-project/src/net/java/nboglpack/joglproject/Bundle.properties
index f2c5b33..c3669d2 100644
--- a/jogl-project/src/net/java/nboglpack/joglproject/Bundle.properties
+++ b/jogl-project/src/net/java/nboglpack/joglproject/Bundle.properties
@@ -1,18 +1,19 @@
-OpenIDE-Module-Display-Category=OpenGL
-OpenIDE-Module-Short-Description=Project templates to create JOGL based
OpenGL applications
-OpenIDE-Module-Long-Description=\
- This module provides several OpenGL templates to make the development of
OpenGL applications more easy. \
- The generated projects work out of the box without native library
configuration and provide well known "best practice" templates to avoid
common JOGL pitfalls.
-OpenIDE-Module-Name=JOGL OpenGL projects
-JOGL=JOGL
-
-LBL_CreateProjectStep=Create a new JOGL project
-
-LBL_Create_net.highteq.gamedev.SimpleJOGL=Create a JOGL Application
-Templates/Project/Standard/SimpleDemo.zip=JOGL Application
-
-LBL_Create_org.yourorghere.SimpleGLCanvas=Create a JOGL Application (Form
Designer, GLCanvas)
-Templates/Project/Standard/SimpleGLCanvas.zip=JOGL Application (Form
Designer, GLCanvas)
-
-LBL_Create_org.yourorghere.SimpleGLJPanel=Create a JOGL Application (Form
Designer, GLJPanel)
-Templates/Project/Standard/SimpleGLJPanel.zip=JOGL Application (Form
Designer, GLJPanel)
+OpenIDE-Module-Display-Category=OpenGL
+OpenIDE-Module-Short-Description=Project templates to create JOGL based
OpenGL applications
+OpenIDE-Module-Long-Description=\
+ This module provides several OpenGL templates to make the development of
OpenGL applications more easy. \
+ The generated projects work out of the box without native library
configuration and provide well known \
+ "best practice" templates to avoid common JOGL pitfalls.
+OpenIDE-Module-Name=JOGL 2 projects
+JOGL=JOGL
+
+LBL_CreateProjectStep=Create a new JOGL project
+
+LBL_Create_net.highteq.gamedev.SimpleJOGL=Create a JOGL Application
+Templates/Project/Standard/SimpleDemo.zip=JOGL Application
+
+LBL_Create_org.yourorghere.SimpleGLCanvas=Create a JOGL Application (Form
Designer, GLCanvas)
+Templates/Project/Standard/SimpleGLCanvas.zip=JOGL Application (Form
Designer, GLCanvas)
+
+LBL_Create_org.yourorghere.SimpleGLJPanel=Create a JOGL Application (Form
Designer, GLJPanel)
+Templates/Project/Standard/SimpleGLJPanel.zip=JOGL Application (Form
Designer, GLJPanel)
diff --git
a/jogl-project/src/net/java/nboglpack/joglproject/resources/GLUEGEN-RT.xml
b/jogl-project/src/net/java/nboglpack/joglproject/resources/GLUEGEN-RT.xml
index 218f477..c16a994 100644
--- a/jogl-project/src/net/java/nboglpack/joglproject/resources/GLUEGEN-RT.xml
+++ b/jogl-project/src/net/java/nboglpack/joglproject/resources/GLUEGEN-RT.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE library PUBLIC "-//NetBeans//DTD Library Declaration 1.0//EN"
"http://www.netbeans.org/dtds/library-declaration-1_0.dtd";>
<library version="1.0">
- <name>GLUEGEN-RT</name>
+ <name>GLUEGEN-RT 2</name>
<type>j2se</type>
<localizing-bundle>net.java.nboglpack.joglproject.Bundle</localizing-bundle>
<volume>
<type>classpath</type>
- <resource>jar:nbinst:///gluegen-runtime/gluegen-rt.jar!/</resource>
+ <resource>jar:nbinst:///gluegen-runtime2/gluegen-rt.jar!/</resource>
</volume>
<volume>
<type>src</type>
diff --git
a/jogl-project/src/net/java/nboglpack/joglproject/resources/JOGL.xml
b/jogl-project/src/net/java/nboglpack/joglproject/resources/JOGL.xml
index 76f11ad..1146fbc 100644
--- a/jogl-project/src/net/java/nboglpack/joglproject/resources/JOGL.xml
+++ b/jogl-project/src/net/java/nboglpack/joglproject/resources/JOGL.xml
@@ -1,20 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE library PUBLIC "-//NetBeans//DTD Library Declaration 1.0//EN"
"http://www.netbeans.org/dtds/library-declaration-1_0.dtd";>
<library version="1.0">
- <name>JOGL</name>
+ <name>JOGL 2</name>
<type>j2se</type>
<localizing-bundle>net.java.nboglpack.joglproject.Bundle</localizing-bundle>
<volume>
<type>classpath</type>
- <resource>jar:nbinst:///jogl-runtime/jogl.jar!/</resource>
+ <resource>jar:nbinst:///jogl-runtime2/jogl.all.jar!/</resource>
+
<resource>jar:nbinst:///jogl-runtime2/nativewindow.all.jar!/</resource>
+ <resource>jar:nbinst:///jogl-runtime2/newt.all.jar!/</resource>
</volume>
<volume>
<type>javadoc</type>
- <resource>jar:nbinst:///jogl-runtime/jogl-docs.zip!/</resource>
+ <resource>jar:nbinst:///jogl-runtime2/jogl-docs.zip!/</resource>
</volume>
<volume>
<type>src</type>
-
<resource>jar:nbinst:///jogl-runtime/jogl-src.zip!/jogl/src/classes/</resource>
-
<resource>jar:nbinst:///jogl-runtime/jogl-src.zip!/jogl/build/gensrc/classes/</resource>
+
<resource>jar:nbinst:///jogl-runtime2/jogl-src.zip!/jogl/src/classes/</resource>
+
<resource>jar:nbinst:///jogl-runtime2/jogl-src.zip!/jogl/build/gensrc/classes/</resource>
</volume>
</library>
diff --git a/jogl-project1/build.xml b/jogl-project1/build.xml
new file mode 100644
index 0000000..54949e2
--- /dev/null
+++ b/jogl-project1/build.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- You may freely edit this file. See harness/README in the NetBeans
platform -->
+<!-- for some information on what you could do (e.g. targets to override).
-->
+<!-- If you delete this file and reopen the project it will be recreated. -->
+<project name="net.java.nboglpack.joglproject.jogl1" default="netbeans"
basedir=".">
+ <description>Builds, tests, and runs the project
net.java.nboglpack.joglproject.jogl1.</description>
+ <import file="nbproject/build-impl.xml"/>
+</project>
diff --git a/jogl-project1/manifest.mf b/jogl-project1/manifest.mf
new file mode 100644
index 0000000..ce80cd7
--- /dev/null
+++ b/jogl-project1/manifest.mf
@@ -0,0 +1,6 @@
+Manifest-Version: 1.0
+OpenIDE-Module: net.java.nboglpack.joglproject.jogl1
+OpenIDE-Module-Layer: net/java/nboglpack/joglproject/jogl1/layer.xml
+OpenIDE-Module-Localizing-Bundle:
net/java/nboglpack/joglproject/jogl1/Bundle.properties
+OpenIDE-Module-Specification-Version: 1.0
+
diff --git a/jogl-project1/nbproject/build-impl.xml
b/jogl-project1/nbproject/build-impl.xml
new file mode 100644
index 0000000..dd730d2
--- /dev/null
+++ b/jogl-project1/nbproject/build-impl.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+*** GENERATED FROM project.xml - DO NOT EDIT ***
+*** EDIT ../build.xml INSTEAD ***
+-->
+<project name="net.java.nboglpack.joglproject.jogl1-impl" basedir="..">
+ <fail message="Please build using Ant 1.7.1 or higher.">
+ <condition>
+ <not>
+ <antversion atleast="1.7.1"/>
+ </not>
+ </condition>
+ </fail>
+ <property file="nbproject/private/suite-private.properties"/>
+ <property file="nbproject/suite.properties"/>
+ <fail unless="suite.dir">You must set 'suite.dir' to point to your
containing module suite</fail>
+ <property
file="${suite.dir}/nbproject/private/platform-private.properties"/>
+ <property file="${suite.dir}/nbproject/platform.properties"/>
+ <macrodef name="property"
uri="http://www.netbeans.org/ns/nb-module-project/2";>
+ <attribute name="name"/>
+ <attribute name="value"/>
+ <sequential>
+ <property name="@{name}" value="${@{value}}"/>
+ </sequential>
+ </macrodef>
+ <macrodef name="evalprops"
uri="http://www.netbeans.org/ns/nb-module-project/2";>
+ <attribute name="property"/>
+ <attribute name="value"/>
+ <sequential>
+ <property name="@{property}" value="@{value}"/>
+ </sequential>
+ </macrodef>
+ <property file="${user.properties.file}"/>
+ <nbmproject2:property name="harness.dir"
value="nbplatform.${nbplatform.active}.harness.dir"
xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
+ <nbmproject2:property name="nbplatform.active.dir"
value="nbplatform.${nbplatform.active}.netbeans.dest.dir"
xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
+ <nbmproject2:evalprops property="cluster.path.evaluated"
value="${cluster.path}"
xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
+ <fail message="Path to 'platform' cluster missing in $${cluster.path}
property or using corrupt Netbeans Platform (missing harness).">
+ <condition>
+ <not>
+ <contains string="${cluster.path.evaluated}"
substring="platform"/>
+ </not>
+ </condition>
+ </fail>
+ <import file="${harness.dir}/build.xml"/>
+</project>
diff --git a/jogl-project1/nbproject/genfiles.properties
b/jogl-project1/nbproject/genfiles.properties
new file mode 100644
index 0000000..9349c47
--- /dev/null
+++ b/jogl-project1/nbproject/genfiles.properties
@@ -0,0 +1,8 @@
+build.xml.data.CRC32=04d6aa51
+build.xml.script.CRC32=f00445c0
+build.xml.stylesheet.CRC32=79c3b980@1.28.2.7
+# This file is used by a NetBeans-based IDE to track changes in generated
files such as build-impl.xml.
+# Do not edit this file. You may delete it but then the IDE will never
regenerate such files for you.
+nbproject/build-impl.xml.data.CRC32=04d6aa51
+nbproject/build-impl.xml.script.CRC32=5725090d
+nbproject/build-impl.xml.stylesheet.CRC32=261c4bef@1.28.2.7
diff --git a/jogl-project1/nbproject/platform.properties
b/jogl-project1/nbproject/platform.properties
new file mode 100644
index 0000000..159047b
--- /dev/null
+++ b/jogl-project1/nbproject/platform.properties
@@ -0,0 +1,15 @@
+cluster.path=\
+ ${nbplatform.active.dir}/apisupport:\
+ ${nbplatform.active.dir}/harness:\
+ ${nbplatform.active.dir}/ide:\
+ ${nbplatform.active.dir}/java:\
+ ${nbplatform.active.dir}/nb:\
+ ${nbplatform.active.dir}/platform
+disabled.clusters=\
+ gsf1,\
+ profiler3,\
+ websvccommon1
+disabled.modules=\
+ org.netbeans.modules.websvc.saas.codegen.java
+nbjdk.active=default
+nbplatform.active=default
diff --git a/jogl-project1/nbproject/private/platform-private.properties
b/jogl-project1/nbproject/private/platform-private.properties
new file mode 100644
index 0000000..d5b7fc2
--- /dev/null
+++ b/jogl-project1/nbproject/private/platform-private.properties
@@ -0,0 +1 @@
+user.properties.file=/home/mbien/.netbeans/6.7/build.properties
diff --git a/jogl-project1/nbproject/private/private.xml
b/jogl-project1/nbproject/private/private.xml
new file mode 100644
index 0000000..c1f155a
--- /dev/null
+++ b/jogl-project1/nbproject/private/private.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-private xmlns="http://www.netbeans.org/ns/project-private/1";>
+ <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/>
+</project-private>
diff --git a/jogl-project1/nbproject/project.properties
b/jogl-project1/nbproject/project.properties
new file mode 100644
index 0000000..152f44e
--- /dev/null
+++ b/jogl-project1/nbproject/project.properties
@@ -0,0 +1,2 @@
+javac.source=1.5
+javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/jogl-project1/nbproject/project.xml
b/jogl-project1/nbproject/project.xml
new file mode 100644
index 0000000..6c5232e
--- /dev/null
+++ b/jogl-project1/nbproject/project.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1";>
+ <type>org.netbeans.modules.apisupport.project</type>
+ <configuration>
+ <data xmlns="http://www.netbeans.org/ns/nb-module-project/3";>
+
<code-name-base>net.java.nboglpack.joglproject.jogl1</code-name-base>
+ <suite-component/>
+ <module-dependencies/>
+ <public-packages/>
+ </data>
+ </configuration>
+</project>
diff --git a/jogl-project1/nbproject/suite.properties
b/jogl-project1/nbproject/suite.properties
new file mode 100644
index 0000000..29d7cc9
--- /dev/null
+++ b/jogl-project1/nbproject/suite.properties
@@ -0,0 +1 @@
+suite.dir=${basedir}/..
diff --git
a/jogl-project1/src/net/java/nboglpack/joglproject/jogl1/Bundle.properties
b/jogl-project1/src/net/java/nboglpack/joglproject/jogl1/Bundle.properties
new file mode 100644
index 0000000..b0aad5e
--- /dev/null
+++ b/jogl-project1/src/net/java/nboglpack/joglproject/jogl1/Bundle.properties
@@ -0,0 +1 @@
+OpenIDE-Module-Name=JOGL 1 projects (dummy)
diff --git a/jogl-project1/src/net/java/nboglpack/joglproject/jogl1/layer.xml
b/jogl-project1/src/net/java/nboglpack/joglproject/jogl1/layer.xml
new file mode 100644
index 0000000..82829f6
--- /dev/null
+++ b/jogl-project1/src/net/java/nboglpack/joglproject/jogl1/layer.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.1//EN"
"http://www.netbeans.org/dtds/filesystem-1_1.dtd";>
+<filesystem>
+ <folder name="org-netbeans-api-project-libraries">
+ <folder name="Libraries">
+ <file name="JOGL.xml" url="resources/JOGL.xml"/>
+ <file name="GLUEGEN-RT.xml" url="resources/GLUEGEN-RT.xml"/>
+ </folder>
+ </folder>
+</filesystem>
diff --git
a/jogl-project1/src/net/java/nboglpack/joglproject/jogl1/resources/GLUEGEN-RT.xml
b/jogl-project1/src/net/java/nboglpack/joglproject/jogl1/resources/GLUEGEN-RT.xml
new file mode 100644
index 0000000..218f477
--- /dev/null
+++
b/jogl-project1/src/net/java/nboglpack/joglproject/jogl1/resources/GLUEGEN-RT.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE library PUBLIC "-//NetBeans//DTD Library Declaration 1.0//EN"
"http://www.netbeans.org/dtds/library-declaration-1_0.dtd";>
+<library version="1.0">
+ <name>GLUEGEN-RT</name>
+ <type>j2se</type>
+
<localizing-bundle>net.java.nboglpack.joglproject.Bundle</localizing-bundle>
+ <volume>
+ <type>classpath</type>
+ <resource>jar:nbinst:///gluegen-runtime/gluegen-rt.jar!/</resource>
+ </volume>
+ <volume>
+ <type>src</type>
+
+ </volume>
+ <volume>
+ <type>javadoc</type>
+
+ </volume>
+</library>
diff --git
a/jogl-project1/src/net/java/nboglpack/joglproject/jogl1/resources/JOGL.xml
b/jogl-project1/src/net/java/nboglpack/joglproject/jogl1/resources/JOGL.xml
new file mode 100644
index 0000000..76f11ad
--- /dev/null
+++
b/jogl-project1/src/net/java/nboglpack/joglproject/jogl1/resources/JOGL.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE library PUBLIC "-//NetBeans//DTD Library Declaration 1.0//EN"
"http://www.netbeans.org/dtds/library-declaration-1_0.dtd";>
+<library version="1.0">
+ <name>JOGL</name>
+ <type>j2se</type>
+
<localizing-bundle>net.java.nboglpack.joglproject.Bundle</localizing-bundle>
+ <volume>
+ <type>classpath</type>
+ <resource>jar:nbinst:///jogl-runtime/jogl.jar!/</resource>
+ </volume>
+ <volume>
+ <type>javadoc</type>
+ <resource>jar:nbinst:///jogl-runtime/jogl-docs.zip!/</resource>
+ </volume>
+ <volume>
+ <type>src</type>
+
<resource>jar:nbinst:///jogl-runtime/jogl-src.zip!/jogl/src/classes/</resource>
+
<resource>jar:nbinst:///jogl-runtime/jogl-src.zip!/jogl/build/gensrc/classes/</resource>
+ </volume>
+</library>
diff --git a/jogl1/.gitignore b/jogl1/.gitignore
index 92faf78..67ae50f 100644
--- a/jogl1/.gitignore
+++ b/jogl1/.gitignore
@@ -1,2 +1,3 @@
build
-release/*
+release
+nbproject/private
diff --git a/jogl1/build.xml b/jogl1/build.xml
index f6bd6ad..6a625c1 100644
--- a/jogl1/build.xml
+++ b/jogl1/build.xml
@@ -4,5 +4,43 @@
<!-- If you delete this file and reopen the project it will be recreated. -->
<project name="javax.media.opengl.jogl1" default="netbeans" basedir=".">
<description>Builds, tests, and runs the project
javax.media.opengl.jogl1.</description>
+ <property file="./../nbproject/global.properties"/>
+ <property file="./../nbproject/private/global_private.properties"/>
<import file="nbproject/build-impl.xml"/>
+
+ <taskdef resource="net/sf/antcontrib/antcontrib.properties"/>
+
+ <target name="clean">
+
+ <delete includeemptydirs="true">
+ <fileset dir="release/jogl-runtime" includes="**/*"/>
+ <fileset dir="release/modules/ext" includes="**/*"/>
+ </delete>
+
+ </target>
+
+ <target name="-pre-compile">
+
+ <!--unzip jogl distribution-->
+ <unzip src="jogl-dist/jogl-webstart.zip"
dest="release/jogl-runtime/"/>
+
+ <!--unzip natives-->
+ <foreach param="filepath" target="unzip-natives" inheritall="true">
+ <fileset dir="release/jogl-runtime"
includes="jogl-natives-*.jar"/>
+ </foreach>
+
+ </target>
+
+ <target name="unzip-natives">
+ <basename property="filename" file="${filepath}" suffix=".jar"/>
+ <propertyregex property="libname" input="${filename}"
regexp="(^.*)-natives-(.*)$" select="\1.jar"/>
+ <propertyregex property="platform" input="${filename}"
regexp="^.*-natives-(.*)$" select="\1"/>
+ <unzip src="${filepath}"
dest="release/jogl-runtime/${libname}-natives-${platform}">
+ <patternset excludes="META-INF/*,META-INF"/>
+ </unzip>
+ <delete file="${filepath}"/>
+ </target>
+
+ <target name="compile"
depends="-pre-compile,projectized-common.compile"/>
+
</project>
diff --git a/jogl1/nbproject/genfiles.properties
b/jogl1/nbproject/genfiles.properties
index 551ea12..be34e03 100644
--- a/jogl1/nbproject/genfiles.properties
+++ b/jogl1/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=060cdb78
+build.xml.data.CRC32=e3d5f67d
build.xml.script.CRC32=7e89f28f
build.xml.stylesheet.CRC32=79c3b980@1.28.2.7
# This file is used by a NetBeans-based IDE to track changes in generated
files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never
regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=060cdb78
+nbproject/build-impl.xml.data.CRC32=e3d5f67d
nbproject/build-impl.xml.script.CRC32=fe3a1161
nbproject/build-impl.xml.stylesheet.CRC32=261c4bef@1.28.2.7
diff --git a/jogl1/src/javax/media/opengl/jogl1/Bundle.properties
b/jogl1/src/javax/media/opengl/jogl1/Bundle.properties
index 2b09514..f5a6d1e 100644
--- a/jogl1/src/javax/media/opengl/jogl1/Bundle.properties
+++ b/jogl1/src/javax/media/opengl/jogl1/Bundle.properties
@@ -1,5 +1,5 @@
OpenIDE-Module-Display-Category=Libraries
OpenIDE-Module-Long-Description=\
JOGL 1 (JSR 231) library wrapper module for maintaining backwards
compability with old project templates.
-OpenIDE-Module-Name=JOGL 1 runtime libraries
+OpenIDE-Module-Name=JOGL 1 runtime libraries (dummy)
OpenIDE-Module-Short-Description=JOGL 1 (JSR 231) library wrapper module for
maintaining backwards compability
diff --git
a/native-lib-support/src/net/java/nativelibsupport/NativeLibSupport.java
b/native-lib-support/src/net/java/nativelibsupport/NativeLibSupport.java
index 14d0c74..70a9b2b 100644
--- a/native-lib-support/src/net/java/nativelibsupport/NativeLibSupport.java
+++ b/native-lib-support/src/net/java/nativelibsupport/NativeLibSupport.java
@@ -44,12 +44,14 @@ public class NativeLibSupport {
assert libraryName!=null;
assert configFile!=null;
assert distributionFolder!=null;
-
+
+ libraryName+=".jar";
+
try{
JarFileSystem jarSystem = new JarFileSystem();
// read jogl version from manifest and compare with deployed
version
- jarSystem.setJarFile(new
File(distributionFolder+File.separator+libraryName+".jar"));
+ jarSystem.setJarFile(new
File(distributionFolder+File.separator+libraryName));
String jarVersion =
jarSystem.getManifest().getMainAttributes().getValue("Implementation-Version");
if(jarVersion == null)
@@ -71,7 +73,7 @@ public class NativeLibSupport {
propertyFile.createNewFile();
}
- String deployedLibVersion =
properties.getProperty(libraryName+".jar", null);
+ String deployedLibVersion = properties.getProperty(libraryName,
null);
// check if we've already deployed
@@ -120,11 +122,11 @@ public class NativeLibSupport {
copyFolderEntries(libSourceFolder, libTargetFolder);
// update deployed version property
- properties.put(lib.getName(), jarVersion);
+ properties.put(libraryName, jarVersion);
properties.store(new FileOutputStream(propertyFile),
"deployed native libraries (remove entry and restart to force
re-deployment)");
Logger.getLogger(NativeLibSupport.class.getName()).info(
- "deployed "+lib.getName()+" version: "+jarVersion );
+ "deployed "+libraryName+" version: "+jarVersion );
}else{
String os = System.getProperty("os.name");
String arch = System.getProperty("os.arch");
diff --git a/nbproject/project.properties b/nbproject/project.properties
index 36e10f8..9d36f4b 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -15,7 +15,8 @@ modules=\
${project.net.java.nboglpack.quicksearch}:\
${project.com.sun.gluegen}:\
${project.com.sun.gluegen.gluegen1}:\
- ${project.javax.media.opengl.jogl1}
+ ${project.javax.media.opengl.jogl1}:\
+ ${project.net.java.nboglpack.joglproject.jogl1}
project.com.sun.gluegen=gluegen
project.com.sun.gluegen.gluegen1=gluegen1
@@ -32,6 +33,7 @@
project.net.java.nboglpack.jogldemosproject=jogl-demos-project
project.net.java.nboglpack.joglglredbookproject=jogl-glredbook-project
project.net.java.nboglpack.joglintegration=jogl-formdesigner-integration
project.net.java.nboglpack.joglproject=jogl-project
+project.net.java.nboglpack.joglproject.jogl1=jogl-project1
project.net.java.nboglpack.joglutils=jogl-utils
project.net.java.nboglpack.quicksearch=gl-quicksearch
|
[netbeans-opengl-pack~glpack-git:c0a8902b] fixed JOGL2 library deployment |
mbien | 08/10/2009 |
