Procházet zdrojové kódy

Tidy up a little after recent changes.

pull/22/head
Greg Holmes před 9 roky
rodič
revize
de69bc6172
4 změnil soubory, kde provedl 1 přidání a 191 odebrání
  1. 1
    45
      .gitignore
  2. 0
    5
      .gitreview
  3. 0
    134
      BuildAll.sh
  4. 0
    7
      test-single.sh

+ 1
- 45
.gitignore Zobrazit soubor

@@ -1,53 +1,9 @@
1 1
 # DMDirc .gitignore file
2
-
3 2
 /build
4 3
 /dist
5 4
 /lib
6
-build-before-profiler.xml
7
-/nbproject/profiler-build-impl.xml
8
-/nbproject/private
9
-/plugins
10
-/junitreports
11
-/junit*.properties
12
-/installer/output/*
13
-/installer/osx/compress-dmg
14
-/installer/signing/*
15
-/installer/windows/*.rc
16
-/installer/windows/*.inc
17
-/installer/windows/*.ico
18
-/installer/windows/DMDirc.jar
19
-.svn
20
-*.class
21
-*.exe
22
-__history
23
-*.bdsproj
24
-*.bdsproj.local
25
-*.identcache
26
-*.res
27
-*.a
28
-*.o
29
-*.ppu
30
-/reports/clover/
31
-/reports/findbugs/
32
-/reports/report-fb.html
33
-/reports/report-pmd.*
34
-/reports/checkstyle.*
35
-/reports/deadcode.txt
36
-/reports/warnings*.txt
37
-/reports/build-log.txt
38
-/reports/tattletale/
39 5
 /etc/clover.license
40 6
 /etc/clover/clover.license
41 7
 /.clover
42
-/test_profile
43 8
 /*.key
44
-/teamcity-info.xml
45
-/.idea/workspace.xml
46
-/.idea/uiDesigner.xml
47
-/atlassian-ide-plugin.xml
48
-/.gradle
49
-/*/build
50
-/etc/nexus-teamcity.properties
51
-/.idea/libraries
52
-/.idea/dictionaries
53
-/nexus-teamcity.gradle
9
+/.gradle

+ 0
- 5
.gitreview Zobrazit soubor

@@ -1,5 +0,0 @@
1
-[gerrit]
2
-host=dmdirc.com
3
-port=29418
4
-project=client
5
-defaultbranch=master

+ 0
- 134
BuildAll.sh Zobrazit soubor

@@ -1,134 +0,0 @@
1
-#!/bin/bash
2
-
3
-# cron doesn't seem to like doing this iself...
4
-. /etc/profile
5
-
6
-# Used for nightly.log to help diagnosing problems
7
-env
8
-
9
-# Path to WWW Directory
10
-WWWDIR="/home/dmdirc/www"
11
-
12
-# Path to trunk
13
-MYDIR="/home/dmdirc/working/nightly"
14
-
15
-# Path to scripts
16
-SCRIPTDIR="/home/dmdirc/scripts"
17
-
18
-# Path to ant binary
19
-ANT="/usr/bin/ant"
20
-
21
-# Path to git binary
22
-GIT="/usr/bin/git"
23
-
24
-# Path to jar binary
25
-JAR="/usr/bin/jar"
26
-
27
-cd ${MYDIR}
28
-
29
-if [ -d .git ]; then
30
-	$GIT reset --hard
31
-	$GIT checkout master
32
-	$GIT pull
33
-	$GIT submodule init
34
-	$GIT submodule update
35
-	GITREV=`$GIT describe`
36
-else
37
-	echo "GIT Directory not found."
38
-	exit 1;
39
-fi;
40
-export DMDIRC_GIT=${GITREV}
41
-
42
-# Archive old nightlies
43
-if [ `date +%d` = "01" ]; then
44
-	echo "Archiving last month's nightlies..."
45
-	OLDDIR=${WWWDIR}/nightly/old/`date -d yesterday +%B%y | tr "[:upper:]" "[:lower:]"`
46
-	mkdir -p ${OLDDIR}
47
-	mv -fv ${WWWDIR}/nightly/*_`date -d yesterday +%Y%m`??_* ${OLDDIR}
48
-	mv -fv ${WWWDIR}/nightly/*-`date -d yesterday +%Y%m`??_* ${OLDDIR}
49
-	rm -Rf ${WWWDIR}/nightly/*_latest*
50
-fi
51
-
52
-# The date/git rev to add to the end of the file names of stuff
53
-FILEDATA=`date +%Y%m%d`_${GITREV}
54
-
55
-# Force rebuild of plugins.
56
-export REBUILDPLUGINS="true"
57
-
58
-# Build plugins/jar
59
-$ANT -Dchannel=NIGHTLY -k clean jar
60
-
61
-PHP=`which php`
62
-
63
-# Check if build failed
64
-if [ ! -e "$MYDIR/dist/DMDirc.jar" ]; then
65
-	# Report failure
66
-	echo "Build failure"
67
-	if [ -e "$SCRIPTDIR/nightly-failure.php" -a "${PHP}" != "" ]; then
68
-		$PHP -q $SCRIPTDIR/nightly-failure.php
69
-	fi
70
-else
71
-	# Build installers
72
-	# Delete all automatically added plugins from the jar to allow the installer
73
-	# to add its own on a per-os basis
74
-	# unzip -l "${MYDIR}/dist/DMDirc.jar" | grep " plugins/" | tr -s ' ' | cut -d ' ' -f 5- | xargs zip "${MYDIR}/dist/DMDirc.jar" -d
75
-
76
-	# Temporary, add certain plugins back in as the installer builds no
77
-        # longer add any at all
78
-	# cd "${MYDIR}"
79
-	#$JAR -uvf "${MYDIR}/dist/DMDirc.jar" plugins/ui_swing.jar plugins/tabcompletion_bash.jar plugins/tabcompletion_mirc.jar plugins/parser_irc.jar
80
-	# Build files automatically do the above, so lets just not remove them for now.
81
-
82
-	cd "${MYDIR}/modules/installer"
83
-	PACKAGENAME="DMDirc-Nightly"
84
-	./makeAll.sh --extra "${FILEDATA}" --packagename "${PACKAGENAME}" --jar "${MYDIR}/dist/DMDirc.jar" --version "${GITREV}"
85
-	cd "${MYDIR}"
86
-
87
-	OUTPUTDIR="${MYDIR}/modules/installer/output"
88
-
89
-	if [ ! -e "${OUTPUTDIR}/${PACKAGENAME}-${FILEDATA}.exe" -o  ! -e "${OUTPUTDIR}/${PACKAGENAME}-${FILEDATA}.deb" -o ! -e "${OUTPUTDIR}/${PACKAGENAME}-${FILEDATA}.dmg" -o ! -e "${OUTPUTDIR}/${PACKAGENAME}-${FILEDATA}.jar" ]; then
90
-		# Report failure
91
-		echo "Installer build failure."
92
-		if [ -e "$SCRIPTDIR/nightly-failure.php" -a "${PHP}" != "" ]; then
93
-			export DMDIRC_INSTALLERFAILURE=true;
94
-			export BAMBOO_BUILD;
95
-			$PHP -q $SCRIPTDIR/nightly-failure.php
96
-		fi
97
-	fi;
98
-
99
-	# Re-add all plugins to the jar so that the nightly .jar has everything.
100
-	# $JAR -uvf "${OUTPUTDIR}/${PACKAGENAME}-${FILEDATA}.jar" plugins
101
-
102
-	function handleNightly() {
103
-		PACKAGENAME="${1}"
104
-		FILEDATA="${2}"
105
-		EXT="${3}"
106
-
107
-		mv -v "${OUTPUTDIR}/${PACKAGENAME}-${FILEDATA}.${EXT}" "${WWWDIR}/nightly/${PACKAGENAME}-${FILEDATA}.${EXT}"
108
-		if [ -e "${WWWDIR}/nightly/${PACKAGENAME}-${FILEDATA}.${EXT}" ]; then
109
-			ln -sfv "${WWWDIR}/nightly/${PACKAGENAME}-${FILEDATA}.${EXT}" "${WWWDIR}/nightly/${PACKAGENAME}_latest.${EXT}"
110
-		fi;
111
-	}
112
-
113
-	handleNightly "${PACKAGENAME}" "${FILEDATA}" "exe"
114
-	handleNightly "${PACKAGENAME}" "${FILEDATA}" "dmg"
115
-	handleNightly "${PACKAGENAME}" "${FILEDATA}" "deb"
116
-	handleNightly "${PACKAGENAME}" "${FILEDATA}" "rpm"
117
-
118
-	## Add to apt repo.
119
-	REPREPRO=`which reprepro`
120
-	if [ "" != "${REPREPRO}" -a -e "/home/dmdirc/www/apt/" ]; then
121
-		${REPREPRO} -V -C dmdirc-nightly -b /home/dmdirc/www/apt/ includedeb all ${WWWDIR}/nightly/${PACKAGENAME}-${FILEDATA}.deb
122
-	fi;
123
-
124
-	# Jars get a different name for some reason.
125
-	mv -v "${OUTPUTDIR}/${PACKAGENAME}-${FILEDATA}.jar" "${WWWDIR}/nightly/DMDirc_${FILEDATA}.jar"
126
-	if [ -e "${WWWDIR}/nightly/DMDirc_${FILEDATA}.jar" ]; then
127
-		ln -sfv "${WWWDIR}/nightly/DMDirc_${FILEDATA}.jar" "${WWWDIR}/nightly/DMDirc_latest.jar"
128
-	fi;
129
-
130
-	# # Update Launchers
131
-	# cd ${MYDIR}/launcher
132
-	# sh ${MYDIR}/launcher/createUpdate.sh
133
-
134
-fi

+ 0
- 7
test-single.sh Zobrazit soubor

@@ -1,7 +0,0 @@
1
-#!/bin/sh
2
-if [ "" = "${1}" ]; then
3
-	echo "Usage: ${0} <test file name>"
4
-	echo "Example: ${0} **/plugins/PluginInfoTest.java"
5
-	exit 1
6
-fi;
7
-ant -Djavac.includes=${1} -Dtest.includes=${1} test-single

Načítá se…
Zrušit
Uložit