diff --git a/eclipse-update/org.lwjgl.build/READ.ME b/eclipse-update/org.lwjgl.build/READ.ME
index dd82b913..d494851a 100644
--- a/eclipse-update/org.lwjgl.build/READ.ME
+++ b/eclipse-update/org.lwjgl.build/READ.ME
@@ -1,3 +1,33 @@
+How to build the Eclipse update site
+------------------------------------
+
+Building the Eclipse update site is fully integrated into the main LWJGL build script.
+Here is how to build the update site:
+
+Run main lwjgl ant script (LWJGL/build.xml) with target "eclipse-updatesite"
+
+You will find the updatesite in
+ LWJGL/eclipse-update/org.lwjgl.build/build/plugins/org.lwjgl.updatesite
+
+Note that there are two targets: eclipse-updatesite and
+eclipse-updatesite-simple. The first one depends from the target "release",
+defined in the main build file. However, if you are sure the relase target has
+been called before, you may want to only create the update site without
+building the release target again. In that case, you can all
+eclipse-update-simple.
+
+The update site build requires some Java classes to be precompiled. These classes
+can be found in some zip archives in folder plugin-classes and anttasks.jar.
+Building these classes requires Eclipse dependencies (in case of the
+plugin-classes) or they define anttasks required to be present when running ant.
+In order to build these classes, open all projects found in subfolder
+LWJGL/eclipse-update in Eclipse: this way, all Eclipse classes will get
+automatically compiled. Then run the ant script buildEclipseClasses.xml from
+within Eclipse. Actually, this is rarely necessary as the archives are all
+committed to the LWJGL SVN and will be present if you check out everything. You
+only need to run that build if the Eclise plugin classes (or the anttasks) were
+changed.
+
The build plugin is part of the LWJGL Eclipse plugins. The following plugins are
required:
@@ -46,35 +76,11 @@ org.lwjgl.build -- THIS Plugin
This is the build script project. Although it is an Eclipse project, you can
simply run the build script with ant from command line. See later on.
-Everything is created in org.lwjgl.build/build.
-Here is how to build the update site:
-
-1) Create a new folder in org.lwjgl.build/lwjgl-archives , use the version
- number as folder name. E.g., for version 2.6 create a folder "2.6",
- for version 2.6.1 "2.6.1" and so on.
-2) Copy the lwjgl, lwjgl-docs and lwjgl-source zips into that folder. E.g.,
- for version 2.6, this folder must contain the following files:
- org.lwjgl.build/lwjgl-archives
- + 2.6
- - lwjgl-2.6.zip
- - lwjgl-docs-2.6.zip
- - lwjgl-source-2.6.zip
-3) In order to run the build script, change to folder org.lwjgl.build and run
- ant with a parameter indicating the appropriate LWJGL version, e.g.
- ant -Dversion=2.6 dist
-
-You will find the updatesite in
- org.lwjgl.build/build/plugins/org.lwjgl.updatesite
-
-You may note that the jars are all signed. I have added a temporary keystore
-with a dummy alias. In order to use your key, simply edit the properties
-(line 11-14) in the build script. If you do not want to store the password in
-the build script, simply define it via "-Dstorepass=****" in the command line.
+Everything is created in LWJGL/eclipse-update/org.lwjgl.build/build.
Some additional remarks:
- The version number is automatically "normalized" to Eclipse standards,
- that is 2.6 will become 2.6.0. You do not have to rename the initial archives,
- you can use 2.6. Or 2.6.1 ;-)
+ that is 2.6 will become 2.6.0 with the current date and time added.
- The lwjgl-debug.jar is not added to the org.lwjgl plugin, as I do not know
how to select one or the other. But I have not further investigated in
that direction.
@@ -85,4 +91,5 @@ Some additional remarks:
to the Eclipse P2 system, which caches a lot of things. Simply uninstalling
a plugin does not remove the plugins from the Eclipse installation. When
the very same version is re-installed, instead of loading new files from the
- update site these pre-installed versions are reused!
\ No newline at end of file
+ update site these pre-installed versions are reused! Since the date and time
+ is added to the plugin version number, this should cause no problems.
\ No newline at end of file
diff --git a/eclipse-update/org.lwjgl.build/anttasks.jar b/eclipse-update/org.lwjgl.build/anttasks.jar
new file mode 100644
index 00000000..b2f9ab10
Binary files /dev/null and b/eclipse-update/org.lwjgl.build/anttasks.jar differ
diff --git a/eclipse-update/org.lwjgl.build/build-updatesite.xml b/eclipse-update/org.lwjgl.build/build-updatesite.xml
new file mode 100644
index 00000000..8cf6f385
--- /dev/null
+++ b/eclipse-update/org.lwjgl.build/build-updatesite.xml
@@ -0,0 +1,482 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Building plugins for version ${lwjgl.version}, normalized version ${eclipse.normversion}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: LWJGL Lightweight Java Game Library
+Bundle-SymbolicName: org.lwjgl
+Bundle-Version: ${eclipse.normversion}
+Bundle-Vendor: ${eclipse.bundle.vendor}
+Bundle-Activator: org.lwjgl.Activator
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime
+Bundle-ActivationPolicy: lazy
+Export-Package: org.lwjgl.eclipse,${NL} ${eclipse.bundle.export-package}
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-ClassPath: .,${NL} ${eclipse.bundle.classpath.jars}
+
+
+
+
+ Manifest-Version: 1.0
+Bundle-Vendor: ${eclipse.bundle.vendor}
+Bundle-Version: ${eclipse.normversion}
+Bundle-SymbolicName: org.lwjgl.doc;singleton:=true
+Bundle-Localization: plugin
+Require-Bundle: org.eclipse.help;bundle-version="3.2.0"
+Eclipse-LazyStart: true
+
+
+
+
+
+
+
+ Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: LWJGL Sources
+Bundle-Vendor: ${eclipse.bundle.vendor}
+Bundle-Version: ${eclipse.normversion}
+Bundle-SymbolicName: org.lwjgl.source;singleton:=true
+Bundle-Localization: plugin
+
+
+
+ Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: LWJGL Test and Info View
+Bundle-Vendor: ${eclipse.bundle.vendor}
+Bundle-Version: ${eclipse.normversion}
+Bundle-SymbolicName: org.lwjgl.info;singleton:=true
+Bundle-Localization: plugin
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.ui.views,
+ org.eclipse.core.resources,
+ org.lwjgl
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+
+
+
+
+
+ Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: LWJGL Tools Plug-in
+Bundle-SymbolicName: org.lwjgl.tools;singleton:=true
+Bundle-Version: ${eclipse.normversion}
+Bundle-Vendor: ${eclipse.bundle.vendor}
+Bundle-Activator: org.lwjgl.tools.Activator
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.core.resources;bundle-version="3.4.0",
+ org.eclipse.jdt.core;bundle-version="3.4.0",
+ org.eclipse.jdt.ui;bundle-version="3.4.0",
+ org.lwjgl;bundle-version="${eclipse.normversion}",
+ org.eclipse.jdt.launching;bundle-version="3.4.0"
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Created Eclipse update site: ${eclipse.build.plugins}/org.lwjgl.updatesite
+
+
+
+
+
+
+
+ This plugin is to be called from main LWJGL build.xml file.
+ It creates the update site, the result will be found in
+ ${eclipse.build.plugins}/org.lwjgl.updatesite
+
+
+
\ No newline at end of file
diff --git a/eclipse-update/org.lwjgl.build/build.xml b/eclipse-update/org.lwjgl.build/build.xml
deleted file mode 100644
index e5f23640..00000000
--- a/eclipse-update/org.lwjgl.build/build.xml
+++ /dev/null
@@ -1,446 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building plugins for version ${version}, normalized version ${normversion}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: LWJGL Lightweight Java Game Library
-Bundle-SymbolicName: org.lwjgl
-Bundle-Version: ${normversion}
-Bundle-Vendor: ${bundle.vendor}
-Bundle-Activator: org.lwjgl.Activator
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime
-Bundle-ActivationPolicy: lazy
-Export-Package: org.lwjgl.eclipse,${NL} ${bundle.export-package}
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ClassPath: .,${NL} ${bundle.classpath.jars}
-
-
-
-
- Manifest-Version: 1.0
-Bundle-Vendor: ${bundle.vendor}
-Bundle-Version: ${normversion}
-Bundle-SymbolicName: org.lwjgl.doc;singleton:=true
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.help;bundle-version="3.2.0"
-Eclipse-LazyStart: true
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: LWJGL Sources
-Bundle-Vendor: ${bundle.vendor}
-Bundle-Version: ${normversion}
-Bundle-SymbolicName: org.lwjgl.source;singleton:=true
-Bundle-Localization: plugin
-
-
-
- Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: LWJGL Test and Info View
-Bundle-Vendor: ${bundle.vendor}
-Bundle-Version: ${normversion}
-Bundle-SymbolicName: org.lwjgl.info;singleton:=true
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.ui.views,
- org.eclipse.core.resources,
- org.lwjgl
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-
-
-
-
-
- Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: LWJGL Tools Plug-in
-Bundle-SymbolicName: org.lwjgl.tools;singleton:=true
-Bundle-Version: ${normversion}
-Bundle-Vendor: ${bundle.vendor}
-Bundle-Activator: org.lwjgl.tools.Activator
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.core.resources;bundle-version="3.4.0",
- org.eclipse.jdt.core;bundle-version="3.4.0",
- org.eclipse.jdt.ui;bundle-version="3.4.0",
- org.lwjgl;bundle-version="${normversion}",
- org.eclipse.jdt.launching;bundle-version="3.4.0"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Call this build with version number and target dist, e.g.
- ant -Dversion=1.1.2 dist
-
-
-
\ No newline at end of file
diff --git a/eclipse-update/org.lwjgl.build/buildEclipseClasses.xml b/eclipse-update/org.lwjgl.build/buildEclipseClasses.xml
new file mode 100644
index 00000000..3c18edee
--- /dev/null
+++ b/eclipse-update/org.lwjgl.build/buildEclipseClasses.xml
@@ -0,0 +1,50 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Call this ant script in order to create archives containing the classes of all
+ Eclipes plugin related classes, such as Activors.
+ This build file removes the burden of building Eclipse dependent classes from
+ within the main build script
+
+
+
\ No newline at end of file
diff --git a/eclipse-update/org.lwjgl.build/plugin-classes/org.lwjgl.info.zip b/eclipse-update/org.lwjgl.build/plugin-classes/org.lwjgl.info.zip
new file mode 100644
index 00000000..194587b4
Binary files /dev/null and b/eclipse-update/org.lwjgl.build/plugin-classes/org.lwjgl.info.zip differ
diff --git a/eclipse-update/org.lwjgl.build/plugin-classes/org.lwjgl.tools.zip b/eclipse-update/org.lwjgl.build/plugin-classes/org.lwjgl.tools.zip
new file mode 100644
index 00000000..02bf0097
Binary files /dev/null and b/eclipse-update/org.lwjgl.build/plugin-classes/org.lwjgl.tools.zip differ
diff --git a/eclipse-update/org.lwjgl.build/plugin-classes/org.lwjgl.zip b/eclipse-update/org.lwjgl.build/plugin-classes/org.lwjgl.zip
new file mode 100644
index 00000000..42217f77
Binary files /dev/null and b/eclipse-update/org.lwjgl.build/plugin-classes/org.lwjgl.zip differ