From db71db17c90fd93bcf38cdf87e16a371c39708e0 Mon Sep 17 00:00:00 2001
From: Mrbytes <eguervos@msn.com>
Date: Thu, 13 Sep 2012 18:13:48 -0400
Subject: [PATCH] Merge branch 'master' of https://github.com/gitblit/gitblit
---
build.xml | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/build.xml b/build.xml
index 3bdfa85..5ea612a 100644
--- a/build.xml
+++ b/build.xml
@@ -122,7 +122,16 @@
<include name="com/gitblit/Constants.java" />
<include name="com/gitblit/utils/StringUtils.java" />
</javac>
- <java classpath="${project.build.dir}" classname="com.gitblit.build.Build" />
+
+ <java classpath="${project.build.dir}" classname="com.gitblit.build.Build">
+ <syspropertyset id="proxy.properties">
+ <propertyref prefix="java.net.useSystemProxies"/>
+ <propertyref prefix="http."/>
+ <propertyref prefix="https."/>
+ <propertyref prefix="ftp."/>
+ <propertyref prefix="socksProxy"/>
+ </syspropertyset>
+ </java>
<!-- Compile Project -->
<path id="master-classpath">
@@ -204,6 +213,7 @@
<include name="sendmail.groovy" />
<include name="jenkins.groovy" />
<include name="protect-refs.groovy" />
+ <include name="localclone.groovy" />
</fileset>
</copy>
@@ -372,6 +382,7 @@
<include name="sendmail.groovy" />
<include name="jenkins.groovy" />
<include name="protect-refs.groovy" />
+ <include name="localclone.groovy" />
</fileset>
</copy>
@@ -418,6 +429,7 @@
<exclude name="com/gitblit/tests/" />
<exclude name="com/gitblit/build/**" />
<exclude name="com/gitblit/client/**" />
+ <exclude name="com/gitblit/AddIndexedBranch*.class" />
<exclude name="com/gitblit/GitBlitServer*.class" />
<exclude name="com/gitblit/Launcher*.class" />
<exclude name="com/gitblit/MakeCertificate*.class" />
@@ -447,6 +459,7 @@
<exclude name="org.slf4j." />
<exclude name="com.beust." />
<exclude name="com.google." />
+ <exclude name="com.unboundid." />
</classfilter>
<classpath refid="master-classpath" />
<manifest>
@@ -548,8 +561,7 @@
</copy>
<!-- Gitblit classes -->
- <mkdir dir="${deployments.root}/WEB-INF/classes"/>
- <copy todir="${deployments.root}/WEB-INF/classes">
+ <jar destfile="${deployments.root}/WEB-INF/lib/gitblit-${gb.version}.jar">
<fileset dir="${project.build.dir}">
<exclude name="WEB-INF/" />
<exclude name="com/gitblit/tests/" />
@@ -559,7 +571,7 @@
<exclude name="com/gitblit/Launcher*.class" />
<exclude name="com/gitblit/MakeCertificate*.class" />
</fileset>
- </copy>
+ </jar>
<!-- Build Express Zip file -->
<zip destfile="${express.zipfile}">
@@ -581,6 +593,7 @@
<resource file="${basedir}/src/com/gitblit/client/splash.png" />
<resource file="${basedir}/resources/gitblt-favicon.png" />
<resource file="${basedir}/resources/gitweb-favicon.png" />
+ <resource file="${basedir}/resources/git-orange-16x16.png" />
<resource file="${basedir}/resources/user_16x16.png" />
<resource file="${basedir}/resources/users_16x16.png" />
<resource file="${basedir}/resources/settings_16x16.png" />
@@ -609,6 +622,7 @@
<exclude name="org.slf4j." />
<exclude name="com.beust." />
<exclude name="com.google." />
+ <exclude name="com.unboundid." />
</classfilter>
<classpath refid="master-classpath" />
<manifest>
@@ -695,6 +709,9 @@
<include name="rome*.jar" />
<exclude name="rome*-sources.jar" />
<exclude name="rome*-javadoc.jar" />
+ <include name="jdom*.jar" />
+ <exclude name="jdom*-sources.jar" />
+ <exclude name="jdom*-javadoc.jar" />
</fileset>
</zip>
</target>
@@ -987,4 +1004,4 @@
<delete dir="${project.war.dir}" />
<delete dir="${project.deploy.dir}" />
</target>
-</project>
+</project>
--
Gitblit v1.9.1