From 1ddaf1646624c1b4d9ab69d3e592f20ac8625a7b Mon Sep 17 00:00:00 2001
From: orbiter <orbiter@6c8d7289-2bf4-0310-a012-ef5d649a1542>
Date: Mon, 14 Sep 2009 17:06:09 +0000
Subject: [PATCH] added generation of a yacycore.jar yacy library file: when a
 ant dist is envoked, the release is built using the new yacycore.jar without
 the class files in classes YaCy consists currently of two main parts: the
 YaCy core and the YaCy interface. This change will make it possible to use
 the YaCy core as part of other projects.

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@6311 6c8d7289-2bf4-0310-a012-ef5d649a1542
---
 build.xml     | 43 +++++++++----------------------------------
 startYACY.bat |  1 -
 startYACY.sh  |  1 -
 3 files changed, 9 insertions(+), 36 deletions(-)

diff --git a/build.xml b/build.xml
index c76440fc5..e79e20373 100644
--- a/build.xml
+++ b/build.xml
@@ -156,8 +156,8 @@
     <copy file="${src}/de/anomic/yacy/yacyBuildProperties.java" tofile="${build}/de/anomic/yacy/yacyBuildProperties.java" overwrite="true" filtering="true" />
 
   </target>
-
-  <target name="compile" depends="init" description="Compiling the yacy sources ...">
+	
+  <target name="compile" depends="init" description="compile YaCy core and YaCy servlets">
     <!-- defining the classpath that should be used for compiling -->
     <path id="project.class.path">
         <pathelement location="${build}" />
@@ -187,7 +187,7 @@
     	<pathelement location="${lib}/xerces.jar" />
     </path>
 
-    <!-- compiling yacyBuildProperties.java -->
+    <!-- compile yacyBuildProperties.java -->
     <javac srcdir="${build}" destdir="${build}" sourcepath="${src}"
            includes="de/anomic/yacy/yacyBuildProperties.java"
            source="${javacSource}" target="${javacTarget}">
@@ -196,7 +196,7 @@
     </javac>
     <delete file="${build}/BuildProperties.java" />
 
-    <!-- compiling the main sources -->
+    <!-- compile the core sources -->
     <javac srcdir="${src}/" destdir="${build}"
            excludes="de/anomic/yacy/yacyBuildProperties.java"
            debug="true" debuglevel="lines,vars,source"
@@ -205,7 +205,7 @@
       <compilerarg value="-Xlint"/>
     </javac>
 
-    <!-- compiling htroot, htroot/yacy and htroot/htdocsdefault -->
+    <!-- compile htroot, htroot/yacy and htroot/htdocsdefault -->
     <javac srcdir="${htroot}/"
     	   excludes="processing/**"
            classpathref="project.class.path"
@@ -215,7 +215,7 @@
     </javac>
   </target>
 
-  <target name="compileHtdocsWWW" depends="compile" description="Compiling and zipping userspecific servlets">
+  <target name="compileHtdocsWWW" depends="compile" description="compile and zip user-specific servlets">
     <!-- defining the classpath that should be used for compiling -->
     <path id="htdocsWWW.class.path">
       <pathelement location="${build}"/>
@@ -226,7 +226,7 @@
       <pathelement location="${htdocsWWW}/" />
     </path>
 
-    <!-- compiling htroot, htroot/yacy and htroot/htdocsdefault -->
+    <!-- compile htroot, htroot/yacy and htroot/htdocsdefault -->
     <javac srcdir="${htdocsWWW}/"
            classpathref="htdocsWWW.class.path"
            debug="true" debuglevel="lines,vars,source"
@@ -237,15 +237,9 @@
   </target>
 
   <target name="copyMain4Dist" depends="compile">
-    <!-- copy main class files -->
-    <copy todir="${release_main}/classes" failonerror="false">
-      <fileset dir="${build}">
-        <include name="**/*.*"/>
-      </fileset>
-    </copy>
 
-    <!-- copy yacy.jar (if available) -->
-    <copy todir="${release_main}" file="yacy.jar" failonerror="false"/>
+    <!-- make a jar file for the YaCy core -->
+    <jar jarfile="${lib}/yacycore.jar" basedir="${build}"/>
 
   	<!-- copy all libs -->
   	    <copy todir="${release_main}/lib">
@@ -618,7 +612,6 @@
   <target name="clean" description="make clean">
     <delete dir="${release_main}" failonerror="false"/>
     <delete file="${build}/de/anomic/yacy/yacyBuildProperties.java" failonerror="false"/>
-    <delete file="yacy.jar" failonerror="false"/>
     <delete file="yacy.exe" failonerror="false"/>
     <delete file="${lib}/svnRevNr.jar" failonerror="false"/>
     <delete file="${libbuild}/svnRevNr.jar" failonerror="false"/>
@@ -633,15 +626,6 @@
   </target>
 
   <target name="installonlinux">
-    <!-- check for jar-file -->
-    <available file="yacy.jar" property="built"/>
-    <fail message="Please build yacy with 'ant clean build-jar'" unless="built"/>
-    <!-- copy main class files -->
-    <copy todir="${DESTDIR}/usr/share/java/">
-      <fileset dir=".">
-        <include name="yacy.jar"/>
-      </fileset>
-    </copy>
 
     <!-- copy configuration files -->
     <copy todir="${DESTDIR}/usr/share/yacy">
@@ -839,15 +823,6 @@
     </javadoc>
   </target>
 
-
-  <target name="build-jar" depends="compile">
-    <jar destfile="yacy.jar" basedir="${build}/">
-      <manifest>
-        <attribute name="Main-Class" value="yacy"/>
-      </manifest>
-    </jar>
-  </target>
-
   <target name="rpm" depends="all" description="Creates the main rpm-package and another for lib">
     <mkdir dir="${release}/RPMS/noarch" />
     <mkdir dir="${release}/BUILD" />
diff --git a/startYACY.bat b/startYACY.bat
index 565987128..68b9bac69 100644
--- a/startYACY.bat
+++ b/startYACY.bat
@@ -10,7 +10,6 @@ If %1.==CPGEN. GoTo :CPGEN
 Rem Generating the proper classpath unsing loops and labels
 Set CLASSPATH=classes;htroot
 For %%X in (lib/*.jar) Do Call %0 CPGEN lib\%%X
-For %%X in (libx/*.jar) Do Call %0 CPGEN libx\%%X
 
 REM Please change the "javastart" settings in the web-interface "Basic Configuration" -> "Advanced" 
 set jmx=
diff --git a/startYACY.sh b/startYACY.sh
index 6678dda99..97345431d 100755
--- a/startYACY.sh
+++ b/startYACY.sh
@@ -169,7 +169,6 @@ fi
 # generating the proper classpath
 CLASSPATH=""
 for N in lib/*.jar; do CLASSPATH="$CLASSPATH$N:"; done
-for N in libx/*.jar; do CLASSPATH="$CLASSPATH$N:"; done
 CLASSPATH="classes:.:htroot:$CLASSPATH"
 
 cmdline="$JAVA $JAVA_ARGS -Djava.awt.headless=true -classpath $CLASSPATH yacy";