[Mc4j-cvs] SF.net SVN: mc4j:[606] trunk/mc4j
Brought to you by:
ghinkl
Menu
▾
▴
[Mc4j-cvs] SF.net SVN: mc4j:[606] trunk/mc4j
|
From: <ian...@us...> - 2009-07-16 17:23:59
|
Revision: 606
http://mc4j.svn.sourceforge.net/mc4j/?rev=606&view=rev
Author: ianpspringer
Date: 2009-07-16 17:23:56 +0000 (Thu, 16 Jul 2009)
Log Message:
-----------
prep for re-tag of EMS 1.2.10 (forgot to update ems.version prop in original tag)
Modified Paths:
--------------
trunk/mc4j/build.xml
trunk/mc4j/modules/ems/build.xml
Property Changed:
----------------
trunk/mc4j/
Property changes on: trunk/mc4j
___________________________________________________________________
Modified: svn:ignore
- .nbintdb
Thumbs.db
.nbattrs
.DS_Store
+ .nbintdb
Thumbs.db
.nbattrs
.DS_Store
build
Modified: trunk/mc4j/build.xml
===================================================================
--- trunk/mc4j/build.xml 2009-07-15 21:13:20 UTC (rev 605)
+++ trunk/mc4j/build.xml 2009-07-16 17:23:56 UTC (rev 606)
@@ -28,7 +28,6 @@
<project name="MC4J" basedir="." default="all">
-
<!--
# Property: build.properties.file
# Specifies the properties file in use for the project. The
@@ -45,8 +44,8 @@
<property name="platform.dir" value="platform6"/>
<property name="application.install" value="build/mc4j"/>
+
-
<target
name="init"
description="Initializes the MC4J build system.">
@@ -60,10 +59,16 @@
<path id="classpath.compile">
<!-- When reasonable, replace these with specific paths -->
- <!-- to openide*.jar and whatever else you need. -->
-
- <pathelement path="modules/ems/dist/org-mc4j-ems.jar"/>
-
+ <!-- to openide*.jar and whatever else you need. -->
+
+ <fileset dir="modules/ems/dist">
+ <include name="org-mc4j-ems-*.jar"/>
+ <exclude name="*-sources.jar"/>
+ <exclude name="*-javadoc.jar"/>
+ <exclude name="*-impl*.jar"/>
+ </fileset>
+
+
<fileset dir="${application.install}/${platform.dir}/core">
<include name="**/*.jar"/>
</fileset>
@@ -197,29 +202,30 @@
</target>
+
+ <property name="platform-file" value="netbeans-5_0-platform.bz2"/>
- <!--<property name="platform-file" value="netbeans-4_1-platform.zip"/>-->
- <property name="platform-file" value="netbeans-5_0-platform.zip"/>
-
<target name="get-nb-platform">
- <mkdir dir="build"/>
<mkdir dir="build/download"/>
- <echo message="Downloading NetBeans Platform (~4.4 MB)"/>
- <!--<get dest="build/download/${platform-file}"
- src="http://www.netbeans.org/download/4_1/fcs/200505031930/66083d474e5fdfc80a1443fb851bd9d5/${platform-file}"
- verbose="true"/>-->
- <get dest="build/download/${platform-file}"
- src="http://us1.mirror.netbeans.org/download/5_0/fcs/200601251500/netbeans-5_0-platform.zip"
- verbose="true"/>
+ <echo message="Downloading NetBeans Platform (~3.6 MB)"/>
+
+ <get dest="build/download/${platform-file}"
+ src="http://download.netbeans.org/netbeans/download/5_0/fcs/200601251500/netbeans-5_0-platform.tar.bz2"
+ verbose="true"/>
</target>
+
<target name="prepare-platform">
-
- <unzip src="build/download/${platform-file}" dest="build"/>
- <rename src="build/netbeans" dest="build/mc4j"/>
+ <bunzip2 src="build/download/${platform-file}" dest="build/download"/>
+ <!-- The tarfile doesn't have a .tar extension for some stupid reason - fix it... -->
+ <move file="build/download/netbeans-5_0-platform" tofile="build/download/netbeans-5_0-platform.tar"/>
+ <untar src="build/download/netbeans-5_0-platform.tar" dest="build"/>
+ <delete dir="build/mc4j" quiet="true"/>
+ <move file="build/netbeans" tofile="build/mc4j"/>
</target>
+
<target name="clean-dist">
<delete dir="build/mc4j"/>
</target>
@@ -228,12 +234,11 @@
<target name="all" depends="get-nb-platform, prepare-platform, build-debug" description="Setup the project and run it"/>
-
-
<target name="build" depends="compile, jars, brand, install, run" description="Build the project including preparation of the nb platform.">
</target>
-
+
+
<target name="build-debug" depends="compile, jars, brand, install, run-debug" description="Build the module.">
</target>
@@ -243,6 +248,7 @@
<ant antfile="build.xml" target="dist" dir="modules/ems"/>
</target>
+
<target name="install" depends="brand, update-dashboards" description="Create the installation of MC4J over top a platform install.">
<!-- install the modules -->
@@ -351,7 +357,7 @@
<target name="clean" description="Clean all build products.">
- <delete>
+ <delete quiet="true">
<fileset dir="classes">
<include name="**/*.class"/>
</fileset>
@@ -368,7 +374,6 @@
</target>
-
<target name="run" description="Directly starts MC4J with the settings as the installer would use.">
<echo message="Starting MC4J with home of ${basedir}/${application.install}"/>
<java
@@ -424,6 +429,7 @@
</java>
</target>
+
<target name="run-debug" description="Directly starts MC4J with the settings as the installer would use.">
<echo>Starting MC4J with debugger</echo>
@@ -489,6 +495,7 @@
</java>
</target>
+
<target name="clear-userdir" description="Cleans out the entire MC4J User Dir">
<deltree dir="${user.home}/.mc4j/${application.version}"/>
<delete file="build/mc4j/ConnectionNodes.db"/>
Modified: trunk/mc4j/modules/ems/build.xml
===================================================================
--- trunk/mc4j/modules/ems/build.xml 2009-07-15 21:13:20 UTC (rev 605)
+++ trunk/mc4j/modules/ems/build.xml 2009-07-16 17:23:56 UTC (rev 606)
@@ -30,7 +30,7 @@
<property name="module.jar" value="org-mc4j-ems.jar"/>
- <property name="release.version" value="1.2.9"/>
+ <property name="release.version" value="1.2.10"/>
<target
@@ -94,11 +94,13 @@
</target>
+
<target name="clean" description="Clean">
<delete dir="classes"/>
<delete dir="javadocs"/>
</target>
+
<target name="compile" depends="init" description="Compiles the MC4J-EMS codebase.">
<mkdir dir="classes"/>
<mkdir dir="classes/main"/>
@@ -160,7 +162,7 @@
</fileset>
</delete>
- <jar jarfile="classes/main/org-mc4j-ems-impl.jar" update="true" compress="false">
+ <jar jarfile="classes/main/org-mc4j-ems-impl-${release.version}.jar" update="true" compress="false">
<fileset dir="classes/impl" includes="org/mc4j/ems/impl/**"/>
<manifest>
<attribute name="Implementation-Title" value="MC4J-EMS"/>
@@ -169,9 +171,9 @@
<attribute name="Implementation-URL" value="http://mc4j.org/"/>
</manifest>
</jar>
- <copy file="classes/main/org-mc4j-ems-impl.jar" todir="dist"/>
+ <copy file="classes/main/org-mc4j-ems-impl-${release.version}.jar" todir="dist"/>
- <jar jarfile="dist/org-mc4j-ems.jar" update="true" compress="false">
+ <jar jarfile="dist/org-mc4j-ems-${release.version}.jar" update="true" compress="false">
<fileset dir="classes/main"/>
<fileset dir="${basedir}" includes="lib/*.jar"/>
<fileset dir="${basedir}" includes="lib/jsr160-includes/*.jar"/>
@@ -188,12 +190,12 @@
</copy>
<!-- sources jars -->
- <jar jarfile="dist/org-mc4j-ems-sources.jar" basedir="src/ems"/>
- <jar jarfile="dist/org-mc4j-ems-impl-sources.jar" basedir="src/ems-impl"/>
+ <jar jarfile="dist/org-mc4j-ems-${release.version}-sources.jar" basedir="src/ems"/>
+ <jar jarfile="dist/org-mc4j-ems-impl-${release.version}-sources.jar" basedir="src/ems-impl"/>
<!-- javadoc jars -->
- <jar jarfile="dist/org-mc4j-ems-javadoc.jar" basedir="javadocs/api"/>
- <jar jarfile="dist/org-mc4j-ems-impl-javadoc.jar" basedir="javadocs/impl"/>
+ <jar jarfile="dist/org-mc4j-ems-${release.version}-javadoc.jar" basedir="javadocs/api"/>
+ <jar jarfile="dist/org-mc4j-ems-impl-${release.version}-javadoc.jar" basedir="javadocs/impl"/>
</target>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
