mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-03 04:37:06 -08:00
Robin H. Johnson
56bd759df1
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
47 lines
1.8 KiB
Diff
47 lines
1.8 KiB
Diff
--- build.xml.orig2 2008-02-06 16:13:45.000000000 +0100
|
|
+++ build.xml 2008-02-06 16:16:48.000000000 +0100
|
|
@@ -276,6 +276,11 @@
|
|
classpathref="compile.classpath"
|
|
classname="org.apache.log.Logger"/>
|
|
|
|
+ <available property="servletapi.present"
|
|
+ classpathref="compile.classpath"
|
|
+ classname="javax.servlet.ServletContextEvent"/>
|
|
+
|
|
+
|
|
<available property="avalon-framework.present"
|
|
classpathref="compile.classpath"
|
|
classname="org.apache.avalon.framework.logger.Logger"/>
|
|
@@ -312,6 +317,13 @@
|
|
</echo>
|
|
</target>
|
|
|
|
+ <target name="servletapi-warning" unless='servletapi.present' depends="init,discovery">
|
|
+ <echo>
|
|
+ *** WARNING ***
|
|
+ ServletAPI not found: Cannot Build ServletContextCleaner
|
|
+ </echo>
|
|
+ </target>
|
|
+
|
|
<target name="avalon-framework-warning" unless='avalon-framework.present' depends='init,discovery'>
|
|
<echo>
|
|
*** WARNING ***
|
|
@@ -334,7 +346,7 @@
|
|
</target>
|
|
|
|
<target name='warning'
|
|
- depends='log4j12-warning,log4j13-warning,logkit-warning,jdk1.4-warning,avalon-framework-warning,compile-1.4'/>
|
|
+ depends='log4j12-warning,log4j13-warning,logkit-warning,jdk1.4-warning,avalon-framework-warning,servletapi-warning,compile-1.4'/>
|
|
|
|
<target name="compile-only"
|
|
depends="prepare,discovery,warning,show-lib-presence,compile-non-log4j,compile-log4j12,compile-log4j13,build-jar"/>
|
|
@@ -362,6 +374,8 @@
|
|
|
|
<exclude name="org/apache/commons/logging/impl/Log4J*.java"/>
|
|
|
|
+ <exclude name="org/apache/commons/logging/impl/ServletContextCleaner.java"
|
|
+ unless="servletapi.present"/>
|
|
<exclude name="org/apache/commons/logging/impl/Jdk13LumberjackLogger.java"
|
|
unless="jdk.1.4.present"/>
|
|
<exclude name="org/apache/commons/logging/impl/Jdk14Logger.java"
|