• R/O
  • SSH
  • HTTPS

jsonic: コミット


コミットメタ情報

リビジョン1845 (tree)
日時2014-10-26 19:30:36
作者hizuno

ログメッセージ

(メッセージはありません)

変更サマリ

差分

--- trunk/jsonic-1.3/build.xml (revision 1844)
+++ trunk/jsonic-1.3/build.xml (revision 1845)
@@ -29,10 +29,6 @@
2929 </classpath>
3030 </javac>
3131
32- <condition property="jar.excludes" value="**/*.java">
33- <isfalse value="${debug}"/>
34- </condition>
35-
3632 <jar destfile="${tmp}/${project.name}-${project.version}.jar">
3733 <fileset dir="${tmp}/build" includes="**/*.class" />
3834 <fileset dir="src" excludes="**/*.java" />
@@ -66,9 +62,9 @@
6662 </target>
6763
6864 <target name="dist" depends="build-sample">
69- <javadoc sourcepath="src" destdir="${tmp}/docs/api" encoding="UTF-8" charset="UTF-8" docencoding="UTF-8" author="true"
65+ <javadoc sourcepath="src" destdir="${tmp}/javadoc" encoding="UTF-8" charset="UTF-8" docencoding="UTF-8" author="true"
7066 additionalparam="-J-Duser.language=en_US">
71- <link href="http://docs.oracle.com/javase/7/docs/api/" />
67+ <link href="http://docs.oracle.com/javase/8/docs/api/" />
7268 <excludepackage name="net.arnx.jsonic.io.*" />
7369 <excludepackage name="net.arnx.jsonic.parse.*" />
7470 <excludepackage name="net.arnx.jsonic.util.*" />
@@ -79,6 +75,10 @@
7975 <fileset dir="${webapps}/guice/WEB-INF/lib" includes="*.jar" />
8076 </classpath>
8177 </javadoc>
78+ <jar destfile="${tmp}/${project.name}-${project.version}-javadoc.jar">
79+ <fileset dir="${tmp}/javadoc" />
80+ </jar>
81+ <delete dir="javadoc" />
8282 </target>
8383
8484 <target name="dist-all">
@@ -86,8 +86,6 @@
8686 <param name="tmp" location="${tmp}/java" />
8787 </antcall>
8888 <zip destfile="${dist}/${project.name}-${project.version}.zip">
89- <zipfileset dir="src" prefix="${project.name}-${project.version}/src/java" />
90- <zipfileset dir="${tmp}/java/docs" prefix="${project.name}-${project.version}/docs/java" />
9189 <zipfileset file="${tmp}/java/${project.name}-${project.version}*.jar" prefix="${project.name}-${project.version}" />
9290
9391 <zipfileset dir="${tmp}/java/sample/basic" prefix="${project.name}-${project.version}/sample" />
--- trunk/jsonic-1.3/lib/build.xml (revision 1844)
+++ trunk/jsonic-1.3/lib/build.xml (revision 1845)
@@ -1,40 +1,44 @@
1-<?xml version="1.0"?>
2-
1+<?xml version="1.0" ?>
32 <project name="jsonic" basedir="." default="build">
4- <property name="version" value="1.3.0" />
3+ <xmlproperty file="pom.xml" />
54
65 <property name="debug" value="true" />
76 <property name="dist" location="." />
87 <property name="tmp" location="${java.io.tmpdir}/${ant.project.name}" />
98
9+ <available property="srcdir.exists" type="dir" file="src" />
10+
1011 <target name="init" depends="clean">
1112 <tstamp />
1213 <mkdir dir="${tmp}" />
1314 </target>
1415
15- <target name="build" depends="init">
16+ <target name="expand-src" unless="srcdir.exists">
17+ <unjar src="${project.name}-${project.version}-sources.jar" dest="src" />
18+ </target>
19+
20+ <target name="build" depends="init,expand-src">
1621 <mkdir dir="${tmp}/lib" />
1722 <get src="http://repo1.maven.org/maven2/servletapi/servlet-api/2.4/servlet-api-2.4.jar" dest="${tmp}/lib/servlet-api.jar" />
1823 <get src="http://maven.seasar.org/maven2/org/seasar/container/s2-framework/2.4.34/s2-framework-2.4.34.jar" dest="${tmp}/lib/s2-framework.jar" />
1924 <get src="http://repo1.maven.org/maven2/springframework/spring/1.2/spring-1.2.jar" dest="${tmp}/lib/spring.jar" />
2025 <get src="http://repo1.maven.org/maven2/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar" dest="${tmp}/lib/commons-logging-1.1.1.jar" />
21- <get src="http://guice-maven.googlecode.com/svn/trunk/com/google/code/guice/guice/2.0/guice-2.0.jar" dest="${tmp}/lib/guice-2.0.jar" />
22- <get src="http://guice-maven.googlecode.com/svn/trunk/com/google/code/guice/guice-servlet/2.0/guice-servlet-2.0.jar" dest="${tmp}/lib/guice-servlet-2.0.jar" />
23-
26+ <get src="http://repo1.maven.org/maven2/commons-beanutils/commons-beanutils/1.8.0/commons-beanutils-1.8.0.jar" dest="${tmp}/lib/commons-beanutils-1.8.0.jar" />
27+ <get src="http://repo1.maven.org/maven2/com/google/inject/guice/3.0/guice-3.0.jar" dest="${tmp}/lib/guice-3.0.jar" />
28+ <get src="http://repo1.maven.org/maven2/com/google/inject/extensions/guice-servlet/3.0/guice-servlet-3.0.jar" dest="${tmp}/lib/guice-servlet-3.0.jar" />
29+
2430 <mkdir dir="${tmp}/build" />
25- <javac source="1.5" target="1.5" srcdir="src/java" destdir="${tmp}/build" debug="${debug}" fork="true">
31+ <javac srcdir="src" destdir="${tmp}/build" debug="${debug}" source="1.5" target="1.5" fork="true">
2632 <classpath>
2733 <fileset dir="${tmp}/lib" includes="*.jar" />
2834 </classpath>
2935 </javac>
3036
31- <jar destfile="${dist}/${ant.project.name}-${version}.jar">
37+ <delete file="${dist}/${ant.project.name}-${version}.jar" />
38+ <jar destfile="${dist}/${project.name}-${project.version}.jar">
3239 <fileset dir="${tmp}/build" includes="**/*.class" />
33- <fileset dir="src/java" excludes="**/*.java" />
40+ <fileset dir="src" excludes="**/*.java" />
3441 </jar>
35- <jar destfile="${dist}/${ant.project.name}-${version}-sources.jar">
36- <fileset dir="src/java" />
37- </jar>
3842 <delete dir="${tmp}/build" />
3943 </target>
4044
@@ -41,6 +45,5 @@
4145 <target name="clean">
4246 <delete dir="${tmp}" failonerror="off" />
4347 <delete file="${dist}/${ant.project.name}-${version}.jar" failonerror="off" />
44- <delete file="${dist}/${ant.project.name}-${version}.swc" failonerror="off" />
4548 </target>
4649 </project>
\ No newline at end of file
旧リポジトリブラウザで表示