Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKonrad Kolosowski2002-07-29 18:31:47 +0000
committerKonrad Kolosowski2002-07-29 18:31:47 +0000
commitfdb96cbb3785669d82aa6c1511d9acb5c138150e (patch)
tree54ec1870eed08024e006d8a9c96b1d0c54f7ba99 /org.eclipse.help.webapp
parentde1aca307c09982b29b33e6d91dc70998a32461b (diff)
downloadeclipse.platform.ua-fdb96cbb3785669d82aa6c1511d9acb5c138150e.tar.gz
eclipse.platform.ua-fdb96cbb3785669d82aa6c1511d9acb5c138150e.tar.xz
eclipse.platform.ua-fdb96cbb3785669d82aa6c1511d9acb5c138150e.zip
*** empty log message ***
Diffstat (limited to 'org.eclipse.help.webapp')
-rw-r--r--org.eclipse.help.webapp/.cvsignore1
-rw-r--r--org.eclipse.help.webapp/WEB-INF/lib/.cvsignore3
-rw-r--r--org.eclipse.help.webapp/build.properties12
-rw-r--r--org.eclipse.help.webapp/buildinfocenter.xml50
4 files changed, 37 insertions, 29 deletions
diff --git a/org.eclipse.help.webapp/.cvsignore b/org.eclipse.help.webapp/.cvsignore
index f0c966cdd..9b9450bbf 100644
--- a/org.eclipse.help.webapp/.cvsignore
+++ b/org.eclipse.help.webapp/.cvsignore
@@ -3,3 +3,4 @@ org.eclipse.help.webapp_*
webapp.jar.bin.log
eclipseurl.jar
eclipseinfocenter.war
+temp.folder
diff --git a/org.eclipse.help.webapp/WEB-INF/lib/.cvsignore b/org.eclipse.help.webapp/WEB-INF/lib/.cvsignore
index 9cb818f86..b44a48e34 100644
--- a/org.eclipse.help.webapp/WEB-INF/lib/.cvsignore
+++ b/org.eclipse.help.webapp/WEB-INF/lib/.cvsignore
@@ -1 +1,2 @@
-webapp.* \ No newline at end of file
+webapp.*
+webappsrc.zip
diff --git a/org.eclipse.help.webapp/build.properties b/org.eclipse.help.webapp/build.properties
index 7f384a198..e8012ab28 100644
--- a/org.eclipse.help.webapp/build.properties
+++ b/org.eclipse.help.webapp/build.properties
@@ -1,7 +1,15 @@
custom=true
+
+#properties for building a plugin
#src.includes=about.html
#source.WEB-INF/lib/webapp.jar=src/
#bin.includes=images/,ns4/,WEB-INF/,*.css,*.html,*.js,*.jsp,plugin.properties,plugin.xml,webapp.properties
#bin.excludes=WEB-INF/classes/
-#war.includes=images/,ns4/,WEB-INF/,*.css,*.html,*.js,*.jsp,webapp.properties
-#war.excludes=WEB-INF/classes/ \ No newline at end of file
+
+#properties for building an infocenter web app
+#src.includes=about.html
+#source.WEB-INF/lib/webapp.jar=src/
+#src.exludes=src/org/eclipse/help/internal/proxy/**
+#bin.includes=images/,ns4/,WEB-INF/,*.css,*.html,*.js,*.jsp,webapp.properties
+#bin.excludes=WEB-INF/classes/
+#jars.extra.classpath=../org.eclipse.tomcat/servlet.jar
diff --git a/org.eclipse.help.webapp/buildinfocenter.xml b/org.eclipse.help.webapp/buildinfocenter.xml
index 8dd0cf6d2..e954fcb58 100644
--- a/org.eclipse.help.webapp/buildinfocenter.xml
+++ b/org.eclipse.help.webapp/buildinfocenter.xml
@@ -30,30 +30,12 @@
<delete dir="${temp.folder}"/>
</target>
- <!-- custom addition begin -->
- <target name="build.war" depends="init">
- <delete dir="${temp.folder}"/>
- <mkdir dir="${temp.folder}"/>
- <antcall target="build.jars"/>
- <antcall target="gather.bin.parts">
- <param name="destination.temp.folder" value="${temp.folder}/"/>
- </antcall>
- <jar jarfile="${plugin.destination}/$eclipseinfocenter.war" basedir="${temp.folder}/${full.name}" filesonly="false"/>
- <delete dir="${temp.folder}"/>
- </target>
- <!-- custom end -->
-
<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
<mkdir dir="${destination.temp.folder}/${full.name}"/>
<mkdir dir="${destination.temp.folder}/${full.name}/WEB-INF/lib"/>
<copy file="${build.result.folder}/WEB-INF/lib/webapp.jar" todir="${destination.temp.folder}/${full.name}/WEB-INF/lib"/>
<copy todir="${destination.temp.folder}/${full.name}">
- <!-- custom change begin -->
- <!--
- <fileset dir="${basedir}" includes="images/,ns4/,WEB-INF/,*.css,*.html,*.js,*.jsp,webapp.properties"/>
- -->
<fileset dir="${basedir}" includes="images/,ns4/,WEB-INF/,*.css,*.html,*.js,*.jsp,webapp.properties" excludes="WEB-INF/classes/"/>
- <!-- custom end -->
</copy>
<!-- custom addition begin -->
<copy file="${basedir}/infocenter/web.xml" todir="${destination.temp.folder}/${full.name}/WEB-INF" overwrite="true"/>
@@ -68,12 +50,7 @@
<delete dir="${temp.folder}/WEB-INF/lib/webapp.jar.bin"/>
<mkdir dir="${temp.folder}/WEB-INF/lib/webapp.jar.bin"/>
<!-- compile the source code -->
- <!-- custom change begin -->
- <!--
- <javac destdir="${temp.folder}/WEB-INF/lib/webapp.jar.bin" failonerror="false" verbose="true" debug="on" includeAntRuntime="no" bootclasspath="${bootclasspath}" classpath="../org.eclipse.core.runtime/runtime.jar;../org.eclipse.help/help.jar;../org.apache.xerces/xercesImpl.jar;../org.eclipse.help/bin;../org.apache.xerces/bin;../org.eclipse.core.runtime/bin;../org.eclipse.core.boot/boot.jar;../org.apache.xerces/xmlParserAPIs.jar;../org.eclipse.core.boot/bin">
- -->
- <javac destdir="${temp.folder}/WEB-INF/lib/webapp.jar.bin" failonerror="false" verbose="true" debug="on" includeAntRuntime="no" bootclasspath="${bootclasspath}" classpath="../org.eclipse.core.runtime/runtime.jar;../org.eclipse.help/help.jar;../org.apache.xerces/xercesImpl.jar;../org.eclipse.help/bin;../org.apache.xerces/bin;../org.eclipse.core.runtime/bin;../org.eclipse.core.boot/boot.jar;../org.apache.xerces/xmlParserAPIs.jar;../org.eclipse.core.boot/bin;../org.eclipse.tomcat/servlet.jar">
- <!-- custom end -->
+ <javac destdir="${temp.folder}/WEB-INF/lib/webapp.jar.bin" failonerror="false" verbose="true" debug="on" includeAntRuntime="no" bootclasspath="${bootclasspath}" classpath="../org.eclipse.core.runtime/runtime.jar;../org.eclipse.help/help.jar;../org.apache.xerces/xercesImpl.jar;../org.eclipse.help/bin;../org.apache.xerces/bin;../org.eclipse.core.runtime/bin;../org.eclipse.core.boot/boot.jar;../org.eclipse.tomcat/servlet.jar;../org.apache.xerces/xmlParserAPIs.jar;../org.eclipse.core.boot/bin">
<src path="src/"/>
</javac>
<!-- copy necessary resources -->
@@ -93,7 +70,7 @@
<target name="WEB-INF/lib/webappsrc.zip" depends="init" unless="WEB-INF/lib/webappsrc.zip">
<mkdir dir="${build.result.folder}/WEB-INF/lib"/>
<zip zipfile="${build.result.folder}/WEB-INF/lib/webappsrc.zip" filesonly="false">
- <fileset dir="src/" includes="**/*.java"/>
+ <fileset dir="src/" includes="**/*.java" excludes="org/eclipse/help/internal/proxy/**"/>
</zip>
</target>
@@ -128,7 +105,7 @@
<delete file="${build.result.folder}/WEB-INF/lib/webappsrc.zip"/>
<delete file="${plugin.destination}/${full.name}.jar"/>
<!-- custom addition begin -->
- <delete file="${plugin.destination}/${full.name}.war"/>
+ <delete file="${plugin.destination}/eclipseinfocenter.zip"/>
<!-- custom end -->
<delete file="${plugin.destination}/${full.name}.zip"/>
<delete dir="${temp.folder}"/>
@@ -138,9 +115,13 @@
<eclipse.refreshLocal resource="${plugin}" depth="infinite"/>
</target>
+ <!-- custom change begin -->
+ <!--
<target name="zip.plugin" depends="init">
<delete dir="${temp.folder}"/>
<mkdir dir="${temp.folder}"/>
+ -->
+ <target name="build.war" depends="init">
<antcall target="build.jars"/>
<antcall target="build.sources"/>
<antcall target="gather.bin.parts">
@@ -152,8 +133,25 @@
<delete>
<fileset dir="${temp.folder}" includes="**/*.bin.log"/>
</delete>
+ <!--
<zip zipfile="${plugin.destination}/${full.name}.zip" basedir="${temp.folder}" filesonly="true"/>
<delete dir="${temp.folder}"/>
+ -->
+ <jar jarfile="${temp.folder}/$eclipseinfocenter.war" basedir="${temp.folder}/${full.name}" filesonly="false"/>
+ </target>
+ <!-- custom end -->
+
+ <!-- custom addition begin -->
+ <target name="zip.infocenter" depends="init">
+ <delete dir="${temp.folder}"/>
+ <mkdir dir="${temp.folder}"/>
+ <antcall target="build.war"/>
+ <zip zipfile="${plugin.destination}/eclipseinfocenter.zip">
+ <zipfileset dir="${temp.folder}" includes="eclipseinfocenter.war"/>
+ <zipfileset dir="${basedir}/infocenter" includes="about.html,notice.html,cpl-v10.html"/>
+ </zip>
+ <delete dir="${temp.folder}"/>
</target>
+ <!-- custom end -->
</project>

Back to the top