浏览代码

Build file changes to support automatic publishing.

Change-Id: Ibb2517bcbcc9d1840328e04b5a315cb44f2823d5
Reviewed-on: http://gerrit.dmdirc.com/3900
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>
changes/00/3900/2
Chris Smith 9 年前
父节点
当前提交
91dcca4b37
共有 3 个文件被更改,包括 17 次插入8 次删除
  1. 1
    0
      .gitignore
  2. 16
    6
      build-publish.xml
  3. 0
    2
      build.xml

+ 1
- 0
.gitignore 查看文件

@@ -8,3 +8,4 @@ build-before-profiler.xml
8 8
 /nbproject/profiler-build-impl.xml
9 9
 /nbproject/genfiles.properties
10 10
 /nbproject/private
11
+/etc/nexus-teamcity.properties

+ 16
- 6
build-publish.xml 查看文件

@@ -2,18 +2,16 @@
2 2
 <project name="DMDirc-Publish" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant">
3 3
     <description>Publish artifacts for DMDirc</description>
4 4
 
5
-    <available file="${git.dir}" property="is.git" />
6
-
7 5
     <target name="-init-version">
8 6
         <taskdef name="git-describe" classname="org.mdonoughe.JGitDescribeTask" classpathref="lib.classpath"/>
9 7
     </target>
10 8
 
11
-    <target name="-get-git-version" depends="-init-version" if="is.git">
9
+    <target name="-get-git-version" depends="-init-version">
12 10
         <git-describe dir="${git.dir}" property="parsers.version.main" subdir="${basedir}/${src.dir}/com/dmdirc/parser/common/;${basedir}/${src.dir}/com/dmdirc/parser/interfaces/" />
13 11
         <git-describe dir="${git.dir}" property="parsers.version.irc" subdir="${basedir}/${src.dir}/com/dmdirc/parser/irc/" />
14 12
     </target>
15 13
 
16
-    <target name="-publish-release" depends="-get-git-version">
14
+    <target name="publish-release" depends="-get-git-version, -init-ivy">
17 15
         <tstamp>
18 16
             <format property="timestamp" pattern="yyyyddMM" />
19 17
         </tstamp>
@@ -47,7 +45,7 @@
47 45
             resolver="upload-release"/>
48 46
     </target>
49 47
 
50
-    <target name="-publish-nightlies" depends="-get-git-version">
48
+    <target name="publish-nightlies" depends="-get-git-version, -init-ivy">
51 49
         <tstamp>
52 50
             <format property="timestamp" pattern="yyyyddMM" />
53 51
         </tstamp>
@@ -82,7 +80,7 @@
82 80
     </target>
83 81
 
84 82
 
85
-    <target name="-publish-snapshot" depends="-get-git-version">
83
+    <target name="publish-snapshot" depends="-get-git-version, -init-ivy">
86 84
         <tstamp>
87 85
             <format property="timestamp" pattern="yyyyddMM" />
88 86
         </tstamp>
@@ -115,4 +113,16 @@
115 113
             artifactspattern="dist/parser.irc.[ext]"
116 114
             resolver="upload-snapshot"/>
117 115
     </target>
116
+
117
+    <target name="init-teamcity" depends="-init-ivy">
118
+        <echo>Downloading private files, if this fails please pass username and</echo>
119
+        <echo>password to ant using -Dusername=... -Dpassword=...</echo>
120
+
121
+        <get src="http://www.dmdirc.com/private/nexus-teamcity.properties" dest="etc/nexus-teamcity.properties" username="${username}" password="${password}"/>
122
+        <loadproperties srcFile="etc/nexus-teamcity.properties"/>
123
+
124
+        <ivy:settings>
125
+          <credentials host="nexus.dmdirc.com" realm="Sonatype Nexus Repository Manager" username="${nexus.user}" passwd="${nexus.pass}"/>
126
+        </ivy:settings>
127
+    </target>
118 128
 </project>

+ 0
- 2
build.xml 查看文件

@@ -38,6 +38,4 @@
38 38
     <target name="-post-test-run">
39 39
         <delete file="${manifest.file}"/>
40 40
     </target>
41
-    <target name="publish-nightlies" depends="clean, jar, -publish-nightlies" />
42
-    <target name="publish-release" depends="clean, jar, -publish-release" />
43 41
 </project>

正在加载...
取消
保存