|
 |
558672 |
From 2dd0e1c44601db267fab47fa903c3f478d624d53 Mon Sep 17 00:00:00 2001
|
|
|
558672 |
From: Juan Hernandez <juan.hernandez@redhat.com>
|
|
|
558672 |
Date: Sat, 10 Mar 2012 17:11:14 +0100
|
|
|
558672 |
Subject: [PATCH 2/5] Don't generate 1.0 runtime
|
|
|
558672 |
|
|
|
558672 |
---
|
|
|
558672 |
build.xml | 23 +----------------------
|
|
|
558672 |
1 files changed, 1 insertions(+), 22 deletions(-)
|
|
|
558672 |
|
|
|
558672 |
diff --git a/build.xml b/build.xml
|
|
|
558672 |
index 7e95870..12631a1 100644
|
|
|
558672 |
--- a/build.xml
|
|
|
558672 |
+++ b/build.xml
|
|
|
558672 |
@@ -798,7 +798,7 @@
|
|
|
558672 |
|
|
|
558672 |
|
|
|
558672 |
|
|
|
558672 |
- depends="compile, integrate-1.0-compiler"
|
|
|
558672 |
+ depends="compile"
|
|
|
558672 |
description="create a distribution in jaxb-ri/dist">
|
|
|
558672 |
<mkdir dir="${jaxb.dist}" />
|
|
|
558672 |
<mkdir dir="${jaxb.dist}/bin" />
|
|
|
558672 |
@@ -834,25 +834,6 @@
|
|
|
558672 |
</jar>
|
|
|
558672 |
</sequential>
|
|
|
558672 |
|
|
|
558672 |
-
|
|
|
558672 |
-
|
|
|
558672 |
-
|
|
|
558672 |
- <sequential>
|
|
|
558672 |
- <createManifest file="${runtime.root}/build/manifest.rt1" extensionName="com.sun.xml.bind" />
|
|
|
558672 |
- <mkdir dir="${jaxb.root}/build/jaxb-1-impl-rejar"/>
|
|
|
558672 |
- <unzip dest="${jaxb.root}/build/jaxb-1-impl-rejar">
|
|
|
558672 |
- <fileset dir="${jaxb.libs.runtime}" includes="*.jar" />
|
|
|
558672 |
- </unzip>
|
|
|
558672 |
-
|
|
|
558672 |
- manifest="${runtime.root}/build/manifest.rt1">
|
|
|
558672 |
-
|
|
|
558672 |
- <fileset dir="${jaxb.root}/build/jaxb-1-impl-rejar"/>
|
|
|
558672 |
- <fileset dir="${runtime-deprecated.classes}"/>
|
|
|
558672 |
- </jar>
|
|
|
558672 |
- <delete dir="${jaxb.root}/build/jaxb-1-impl-rejar"/>
|
|
|
558672 |
- </sequential>
|
|
|
558672 |
-
|
|
|
558672 |
-
|
|
|
558672 |
|
|
|
558672 |
<sequential>
|
|
|
558672 |
<createManifest file="${xjc.root}/manifest.xjc" extensionName="com.sun.tools.xjc" />
|
|
|
558672 |
@@ -884,8 +865,6 @@ Class-Path: ${manifest.classpath}
|
|
|
558672 |
<fileset dir="${jaxb.root}/build/jaxb-xjc-rejar"/>
|
|
|
558672 |
<fileset dir="${xjc.classes}"/>
|
|
|
558672 |
<metainf dir="${xjc.src}/META-INF" />
|
|
|
558672 |
-
|
|
|
558672 |
- <zipfileset dir="${xjc10.classes}/.." />
|
|
|
558672 |
</jar>
|
|
|
558672 |
<delete dir="${jaxb.root}/build/jaxb-xjc-rejar"/>
|
|
|
558672 |
</sequential>
|
|
|
558672 |
--
|
|
|
558672 |
1.7.9
|
|
|
558672 |
|