Browse Source

make BuildAll.sh git-aware.

If a .git dir is present in the directory then git will be used, else fallback to svn.

Change-Id: Iaa528668420258be4eac790c29954ca5e4bb70a8
Reviewed-on: http://gerrit.dmdirc.com/94
Reviewed-by: Chris Smith <chris@dmdirc.com>
Tested-by: Chris Smith <chris@dmdirc.com>
tags/0.6.3b1
Shane Mc Cormack 14 years ago
parent
commit
bfd09f5040
1 changed files with 23 additions and 7 deletions
  1. 23
    7
      BuildAll.sh

+ 23
- 7
BuildAll.sh View File

@@ -21,6 +21,9 @@ ANT="/usr/bin/ant"
21 21
 # Path to svn binary
22 22
 SVN="/usr/bin/svn"
23 23
 
24
+# Path to git binary
25
+GIT="/usr/bin/git"
26
+
24 27
 # Path to jar binary
25 28
 JAR="/usr/bin/jar"
26 29
 
@@ -29,9 +32,14 @@ BAMBOO=/home/dmdirc/Bamboo/xml-data/builds/DMDIRC-NIGHTLY/download-data/build_lo
29 32
 
30 33
 cd ${MYDIR}
31 34
 
32
-$SVN update
33
-SVNREV=`$SVN info | grep Revision`
34
-SVNREV=${SVNREV##*: }
35
+if [ -d .git ]; then
36
+	$GIT pull
37
+	SVNREV=`$GIT describe`
38
+else
39
+	$SVN update
40
+	SVNREV=`$SVN info | grep Revision`
41
+	SVNREV=${SVNREV##*: }
42
+fi;
35 43
 export DMDIRC_SVN=${SVNREV}
36 44
 
37 45
 # Archive old nightlies
@@ -63,9 +71,13 @@ fi;
63 71
 $ANT -Dchannel=NIGHTLY -k clean jar
64 72
 
65 73
 # Now revert the trunk so as not to break updates.
66
-for updatedir in ${REVERTLIST}; do
67
-	${SVN} revert ${updatedir}/*
68
-done;
74
+if [ -d .git ]; then
75
+	${GIT} checkout src/com/dmdirc/config/defaults/;
76
+else
77
+	for updatedir in ${REVERTLIST}; do
78
+		${SVN} revert ${updatedir}/*
79
+	done;
80
+fi;
69 81
 
70 82
 PHP=`which php`
71 83
 
@@ -138,4 +150,8 @@ else
138 150
 	fi;
139 151
 fi
140 152
 
141
-$SVN revert src/com/dmdirc/Main.java
153
+if [ -d .git ]; then
154
+	$GIT checkout src/com/dmdirc/Main.java
155
+else
156
+	$SVN revert src/com/dmdirc/Main.java
157
+fi;

Loading…
Cancel
Save