merged eclipse_3_6 into trunk

git-svn-id: https://svn.objectstyle.org/repos/woproject/trunk@6191 930f2ab1-3212-0410-a8ea-d1eb4cc50a93

build.xml

@@ -67,7 +67,6 @@
         * build.output.build.dir = ${build.output.build.dir}
         * build.output.dist.dir = ${build.output.dist.dir}
         * build.output.dist.targz.dir = ${build.output.dist.targz.dir}
-        * build.output.homepage.dir = ${build.output.homepage.dir}
         * deploy.dir = ${deploy.dir} (set by the buildserver)
         * eclipse.home = ${eclipse.home}
         * eclipse.deps.home = ${eclipse.deps.home}
@@ -85,13 +84,6 @@
         </echo>
 	</target>
 
-	<!-- ========================================== -->
-	<!-- Build homepage.                            -->
-	<!-- ========================================== -->
-	<target name="homepage" unless="no.docs">
-		<ant dir="${project.homepage.dir}" target="all" />
-	</target>
-
 	<!-- ========================================== -->
 	<!-- Build woenvironment.                       -->
 	<!-- ========================================== -->
@@ -170,21 +162,6 @@
 		<ant dir="${project.wolips.dir}" target="dist" />
 	</target>
 
-	<!-- ========================================== -->
-	<!-- Build dist.                                -->
-	<!-- ========================================== -->
-	<target name="distincludinghomepage" depends="allincludinghomepage">
-		<ant dir="${project.woenvironment.dir}" target="dist" />
-		<ant dir="${project.woproject.dir}" target="dist" />
-		<ant dir="${project.wolips.dir}" target="dist" />
-	</target>
-
-	<!-- ========================================== -->
-	<!-- Build all except homepage.                 -->
-	<!-- ========================================== -->
-	<target name="allincludinghomepage" depends="print.environment,verify.clean,set.clean,call.clean,prepare,homepage,woenvironment,woproject,wolips">
-	</target>
-
 	<!-- ========================================== -->
 	<!-- Build buildserver.                         -->
 	<!-- ========================================== -->

buildscripts/ant-style-project.xml

@@ -14,7 +14,7 @@
     <!-- ============================================= -->
     <target name="java">
        <javac srcdir="${param.src.dir}" destdir="${param.dest.dir}" 
-              source="${compile.source}" target="${compile.target}">
+              source="${compile.source}" target="${compile.target}" debug="true">
             <classpath refid="classpath"/>
         </javac>
     </target>

buildscripts/plugin-project.xml

@@ -17,11 +17,13 @@
 			<path refid="classpath" />
 			<fileset dir="${eclipse.home}">
 				<include name="**/plugins/**/*.jar" />
+				<include name="**/dropins/**/*.jar" />
 				<exclude name="**/org.objectstyle.*/**" />
 				<exclude name="**/org.eclipse.core.runtime/**" />
 			</fileset>
 			<fileset dir="${eclipse.plugin.home}">
 				<include name="**/plugins/**/*.jar" />
+				<include name="**/dropins/**/*.jar" />
 				<exclude name="**/org.objectstyle.*/**" />
 				<exclude name="**/org.eclipse.core.runtime/**" />
 			</fileset>
@@ -44,6 +46,7 @@
 			<path refid="classpath" />
 			<fileset dir="${eclipse.home}">
 				<include name="**/plugins/**/*.jar" />
+				<include name="**/dropins/**/*.jar" />
 				<exclude name="**/org.objectstyle.*/**" />
 				<exclude name="**/org.eclipse.core.runtime/**" />
 			</fileset>
@@ -128,9 +131,9 @@
 			<fileset dir="${param.plugin.dir}/java">
 				<include name="**/*.xml" />
 			</fileset>
-			<metainf dir="../../../../homepage/doc">
+			<!-- metainf dir="../../../../homepage/doc">
 				<include name="LICENSE*" />
-			</metainf>
+			</metainf -->
 		</jar>
 	</target>
 
@@ -158,9 +161,9 @@
 			</fileset>
 			<fileset dir="${param.project.dir}/resources">
 			</fileset>
-			<metainf dir="../../../../homepage/doc">
+			<!-- metainf dir="../../../../homepage/doc">
 				<include name="LICENSE*" />
-			</metainf>
+			</metainf -->
 		</jar>
 	</target>
 
@@ -200,7 +203,7 @@
 			<fileset dir="${param.plugin.dir}/java">
 				<exclude name="**/*.java" />
 			</fileset>
-			<zipfileset dir="../../../../homepage/doc" includes="LICENSE*" prefix="META-INF" />
+			<!-- zipfileset dir="../../../../homepage/doc" includes="LICENSE*" prefix="META-INF" / -->
 			<zipfileset dir="${param.build.dist.build.dir}/plugins/${param.plugin.name}_${build.version}/META-INF" prefix="META-INF" />
 		</zip>
 		<delete dir="${param.build.dist.build.dir}/plugins/${param.plugin.name}_${build.version}" />

default.properties

@@ -1,5 +1,5 @@
 #version
-build.version = 3.4.$Revision$
+build.version = 3.5.$Revision$
 #project directories
 project.buildscripts.dir = buildscripts
 project.lib.dir = lib