diff options
author | Luke Shumaker <lukeshu@sbcglobal.net> | 2014-07-25 22:16:14 -0400 |
---|---|---|
committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2014-07-25 22:16:14 -0400 |
commit | 67f1f31c5a4ea264abe0237a88b98cf79ed07052 (patch) | |
tree | fd9a09206d0e2b6e358e73b2fb51e674a5cb4f8a /conf/dependencies.mk | |
parent | 43b30670e62c50454a81a056824c796dada3463e (diff) |
Tidy up
- re-organize sources.mk and dependencies.mk
- remove the non-working groov and gradle
- minor touch-ups to some Makefiles
Diffstat (limited to 'conf/dependencies.mk')
-rw-r--r-- | conf/dependencies.mk | 196 |
1 files changed, 102 insertions, 94 deletions
diff --git a/conf/dependencies.mk b/conf/dependencies.mk index bb78be0..716e95b 100644 --- a/conf/dependencies.mk +++ b/conf/dependencies.mk @@ -1,5 +1,5 @@ # What is needed to use the Modello command line -dep-modello-cli = \ +dep-meta-modello-cli = \ build/packages/guava \ build/packages/modello-core \ build/packages/plexus-build-api \ @@ -8,7 +8,7 @@ dep-modello-cli = \ build/packages/plexus-utils \ build/packages/xbean-bootstrap # What is needed to use the Plexus Metadata Generator command line -dep-plexus-metadata-generator-cli = \ +dep-meta-plexus-metadata-generator-cli = \ build/packages/commons-cli \ build/packages/guava \ build/packages/jdom1 \ @@ -21,30 +21,30 @@ dep-plexus-metadata-generator-cli = \ build/packages/qdox \ build/packages/xbean-bootstrap # Where is xerces2? -dep-xerces2 = \ +dep-meta-xerces2 = \ /usr/share/java/serializer.jar \ /usr/share/java/xercesImpl.jar \ /usr/share/java/xml-apis.jar -# Where is junit? -dep-junit = /usr/share/java/junit.jar -# Implementations of standards -dep-jsr305 = build/packages/jsr305 # "Annotations for Software Defect Detection" -dep-jsr315 = $(dep-servlet30) # "Java Servlet 3.0 Specification" -dep-jsr330 = build/packages/atinject-javax.inject # "Dependency Injection for Java" -dep-jsr340 = $(dep-servlet31) # "Java Servlet 3.1 Specification" +# Implementations (or at least APIs) of standards +dep-std-jsr305 = build/packages/jsr305 # "Annotations for Software Defect Detection" +dep-std-jsr315 = $(dep-std-servlet30) # "Java Servlet 3.0 Specification" +dep-std-jsr330 = build/packages/atinject-javax.inject # "Dependency Injection for Java" +dep-std-jsr340 = $(dep-std-servlet31) # "Java Servlet 3.1 Specification" -dep-jpa10 = $(dep-jpa20) -dep-jpa20 = build/packages/eclipselink-persistence20 -dep-jpa21 = build/packages/eclipselink-persistence21 +dep-std-jpa10 = $(dep-std-jpa20) +dep-std-jpa20 = build/packages/eclipselink-persistence20 +dep-std-jpa21 = build/packages/eclipselink-persistence21 -dep-servlet25 = /usr/share/java/tomcat6/servlet-api.jar -dep-servlet30 = /usr/share/java/tomcat7/servlet-api.jar -dep-servlet31 = /usr/share/java/tomcat8/servlet-api.jar +dep-std-servlet25 = /usr/share/java/tomcat6/servlet-api.jar +dep-std-servlet30 = /usr/share/java/tomcat7/servlet-api.jar +dep-std-servlet31 = /usr/share/java/tomcat8/servlet-api.jar + +dep-std-javamail = /usr/share/java/gnumail.jar ################################################################################ -# Apache +# Apache (from tarballs) build/packages/httpcomponents-core: \ build/packages/commons-cli @@ -54,14 +54,20 @@ build/packages/httpcomponents-client-bootstrap: \ build/packages/httpcomponents-core build/packages/maven: \ - $(dep-modello-cli) \ - $(dep-plexus-metadata-generator-cli) \ - $(dep-jsr330) \ - build/packages/aether-core-bootstrap \ - build/packages/guice-core \ + $(dep-meta-modello-cli) \ + $(dep-meta-plexus-metadata-generator-cli) \ + $(dep-std-jsr330) \ + build/packages/aether-core \ + build/packages/guice-bootstrap \ + build/packages/logback-core \ build/packages/modello-plugins \ + build/packages/plexus-cipher \ build/packages/plexus-component-annotations \ + build/packages/plexus-container-default \ build/packages/plexus-interpolation \ + build/packages/plexus-sec-dispatcher \ + build/packages/sisu-plexus \ + build/packages/slf4j-api \ build/packages/wagon build/packages/maven-artifact-bootstrap: \ build/packages/plexus-utils @@ -72,18 +78,19 @@ build/packages/maven-plugin-api-bootstrap: \ build/packages/plexus-utils build/packages/mina: \ + /usr/share/java/rxtx/RXTXcomm.jar \ + /usr/share/java/tomcat8/tomcat-jni.jar \ build/packages/commons-lang2 \ build/packages/jzlib \ build/packages/ognl \ - build/packages/slf4j-api \ - /usr/share/java/rxtx/RXTXcomm.jar \ - /usr/share/java/tomcat8/tomcat-jni.jar + build/packages/slf4j-api build/packages/mina-sshd: \ + /usr/share/java/tomcat8/tomcat-jni.jar \ build/packages/jzlib \ build/packages/mina \ - build/packages/slf4j-api \ - /usr/share/java/tomcat8/tomcat-jni.jar + build/packages/slf4j-api +# Apache (from SVN) build/packages/maven-plugin-annotations-bootstrap: \ build/packages/maven-artifact-bootstrap build/packages/maven-plugin-tools-api-bootstrap: \ @@ -91,7 +98,6 @@ build/packages/maven-plugin-tools-api-bootstrap: \ build/packages/maven-plugin-api-bootstrap \ build/packages/plexus-container-default \ build/packages/plexus-utils - build/packages/xbean-bootstrap: \ build/packages/asm3 \ build/packages/commons-logging-bootstrap \ @@ -99,7 +105,6 @@ build/packages/xbean-bootstrap: \ build/packages/slf4j-api # Modello - build/packages/modello-core: \ build/packages/plexus-build-api \ build/packages/plexus-container-default \ @@ -111,12 +116,11 @@ build/packages/modello-plugins: \ build/packages/plexus-utils # Plexus - build/packages/plexus-build-api: \ build/packages/plexus-container-default \ build/packages/plexus-utils build/packages/plexus-cipher: \ - $(dep-jsr330) + $(dep-std-jsr330) build/packages/plexus-cli: \ build/packages/commons-cli \ build/packages/plexus-classworlds \ @@ -126,11 +130,10 @@ build/packages/plexus-interactivity: \ build/packages/plexus-container-default \ build/packages/plexus-utils build/packages/plexus-sec-dispatcher: \ - $(dep-modello-cli) \ + $(dep-meta-modello-cli) \ build/packages/modello-plugins \ build/packages/plexus-cipher \ build/packages/plexus-container-default - build/packages/plexus-component-metadata-bootstrap: \ build/packages/asm3 \ build/packages/commons-cli \ @@ -143,14 +146,17 @@ build/packages/plexus-component-metadata-bootstrap: \ build/packages/plexus-utils \ build/packages/qdox build/packages/plexus-container-default: \ - $(dep-junit) \ + /usr/share/java/junit.jar \ build/packages/guava \ build/packages/plexus-classworlds \ build/packages/plexus-utils \ build/packages/xbean-bootstrap # OSGi -build/packages/osgi50-enterprise: build/packages/osgi50-core $(dep-servlet31) $(dep-jpa21) +build/packages/osgi50-enterprise: \ + $(dep-std-jpa21) \ + $(dep-std-servlet31) \ + build/packages/osgi50-core # ASM build/packages/ow-util-ant-tasks: build/packages/asm2 @@ -160,8 +166,17 @@ build/packages/asm3: build/packages/ow-util-ant-tasks build/packages/asm4: build/packages/ow-util-ant-tasks build/packages/bnd build/packages/asm5: build/packages/ow-util-ant-tasks build/packages/bnd -# Misc +# Quality Open Software +build/packages/logback-core: \ + $(dep-std-javamail) \ + $(dep-std-servlet25) \ + build/packages/janino \ + build/packages/jansi +build/packages/cal10n: \ + build/packages/maven-artifact-bootstrap \ + build/packages/maven-plugin-api-bootstrap +# Eclipse build/packages/aether-core: \ build/packages/guice-bootstrap \ build/packages/httpcomponents-client-bootstrap \ @@ -173,44 +188,59 @@ build/packages/aether-core: \ build/packages/sisu-inject-bootstrap \ build/packages/slf4j-api \ build/packages/wagon +build/packages/eclipselink-persistence20: \ + build/packages/osgi50-core # any version would probably work +build/packages/eclipselink-persistence21: \ + build/packages/osgi50-core # any version would probably work +build/packages/sisu-inject-bootstrap: \ + /usr/share/java/junit.jar \ + $(dep-std-servlet25) \ + build/packages/guice-bootstrap \ + build/packages/osgi50-core \ + build/packages/slf4j-api +build/packages/sisu-plexus: \ + /usr/share/java/junit.jar \ + $(dep-std-jsr330) \ + build/packages/guice-bootstrap \ + build/packages/osgi50-core \ + build/packages/plexus-classworlds \ + build/packages/plexus-component-annotations \ + build/packages/plexus-utils \ + build/packages/sisu-inject-bootstrap \ + build/packages/slf4j-api + +# FuseSource +build/packages/jansi: \ + build/packages/jansi-native +build/packages/jansi-native: \ + build/packages/hawtjni-bootstrap +build/packages/hawtjni-bootstrap: \ + build/packages/commons-cli \ + build/packages/xbean-bootstrap + +# Misc (from tarballs) build/packages/bnd: \ - $(dep-junit) \ + /opt/apache-ant/lib/ant.jar \ + /usr/share/java/junit.jar \ build/packages/osgi50-core \ - build/packages/osgi50-enterprise \ - /opt/apache-ant/lib/ant.jar -build/packages/cal10n: \ - build/packages/maven-artifact-bootstrap \ - build/packages/maven-plugin-api-bootstrap + build/packages/osgi50-enterprise build/packages/cglib: \ build/packages/asm4 \ build/packages/jarjar -build/packages/guava: \ - $(dep-jsr305) build/packages/guice-bootstrap: \ - $(dep-jsr330) \ - $(dep-jpa10) \ - $(dep-servlet25) \ + $(dep-std-jsr330) \ + $(dep-std-jpa10) \ + $(dep-std-servlet25) \ build/packages/aopalliance \ build/packages/asm3 \ build/packages/cglib -build/packages/groovy: \ - build/packages/asm5 \ - build/packages/commons-cli \ - build/packages/jansi \ - build/packages/xstream \ - /usr/share/java/antlr2.jar -build/packages/logback-core: \ - $(dep-javamail) \ - $(dep-servlet25) \ - build/packages/janino \ - build/packages/jansi build/packages/ognl: \ - build/packages/javassist \ - /usr/share/java/javacc.jar + /usr/share/java/javacc.jar \ + build/packages/javassist build/packages/qdox: \ build/packages/jflex build/packages/wagon: \ - $(dep-junit) \ + /usr/share/java/junit.jar \ build/packages/commons-io \ build/packages/commons-lang2 \ build/packages/commons-net \ @@ -219,53 +249,31 @@ build/packages/wagon: \ build/packages/jsoup \ build/packages/plexus-interactivity \ build/packages/plexus-utils -build/packages/janino: \ - /opt/apache-ant/lib/ant.jar + +# Misc (from VCS) +build/packages/guava: \ + $(dep-std-jsr305) build/packages/jarjar: \ build/packages/asm4 \ build/packages/maven-plugin-api-bootstrap -build/packages/jansi: \ - build/packages/jansi-native -build/packages/jansi-native: \ - build/packages/hawtjni-bootstrap -build/packages/hawtjni-bootstrap: \ - build/packages/commons-cli \ - build/packages/xbean-bootstrap +# Misc individual things I decided to give multiple lines to in sources.mk -build/packages/eclipselink-persistence20: \ - build/packages/osgi50-core # any version would probably work -build/packages/eclipselink-persistence21: \ - build/packages/osgi50-core # any version would probably work -build/packages/sisu-inject-bootstrap: \ - $(dep-junit) \ - $(dep-servlet25) \ - build/packages/guice-bootstrap \ - build/packages/osgi50-core \ - build/packages/slf4j-api -build/packages/sisu-plexus: \ - $(dep-junit) \ - $(dep-jsr330) \ - build/packages/guice-bootstrap \ - build/packages/osgi50-core \ - build/packages/plexus-classworlds \ - build/packages/plexus-component-annotations \ - build/packages/plexus-utils \ - build/packages/sisu-inject-bootstrap \ - build/packages/slf4j-api +build/packages/janino: \ + /opt/apache-ant/lib/ant.jar # JDOM/Jaxen build/packages/jdom1: \ build/packages/jaxen-bootstrap \ - $(dep-xerces2) + $(dep-meta-xerces2) build/packages/jaxen-bootstrap: \ build/packages/jdom1-bootstrap build/packages/jdom1-bootstrap: \ - $(dep-xerces2) + $(dep-meta-xerces2) # JFlex build/packages/jflex: \ - $(dep-junit) \ + /usr/share/java/junit.jar \ build/packages/jflex-bootstrap build/packages/jflex-bootstrap: \ - $(dep-junit) + /usr/share/java/junit.jar |