Check-in [fac84a637c]
Overview
Comment:Updated to include package version in output directory
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: fac84a637cde39247e268766d443e882504550db
User & Date: rkeene on 2011-07-19 23:58:03
Other Links: manifest | tags
Context
2011-07-19
23:59
Fixed missing file from buildsrc build check-in: ffd307b622 user: rkeene tags: trunk
23:58
Updated to include package version in output directory check-in: fac84a637c user: rkeene tags: trunk
23:32
Added support for using platform::identify Added tdom build support check-in: 5a1dc6798b user: rkeene tags: trunk
Changes

Modified server/buildpkgs/build_all.sh from [17e48df935] to [98c08187b6].

178
179
180
181
182
183
184
185

186
187

188
189
190
191

192
193
194
195



196
197
198
199
200
201
202
178
179
180
181
182
183
184

185
186

187
188
189
190

191
192
193
194
195
196
197
198
199
200
201
202
203
204
205







-
+

-
+



-
+




+
+
+







		if [ "${DISTCLEAN}" = "1" ]; then
			rm -rf "src"
		fi
		if [ "${CLEANONLY}" = "1" ]; then
			exit 0
		fi

		mkdir -p "out/${PLATFORM}" >/dev/null 2>/dev/null
		mkdir -p "out" >/dev/null 2>/dev/null

		./build.sh > "out/${PLATFORM}/build.log" 2>&1 || exit 1
		./build.sh > "out/build-${PLATFORM}.log" 2>&1 || exit 1
	) || failed=1

	if [ "${failed}" = "1" ]; then
		cp "${dir}/out/${PLATFORM}/build.log" "${dir}/failed-${PLATFORM}-`hostname`.log"
		cp "${dir}/out/build-${PLATFORM}.log" "${dir}/failed-${PLATFORM}-`hostname`.log"

		rm -rf "${dir}/out"
		faileddirs="${faileddirs} ${dir}"
		echo "Failed to build ${dir}"
	else
		outdir="$(ls -1d "${dir}/out"/*/"${PLATFORM}/" | head -1)"
		mv "${dir}/out/build-${PLATFORM}.log" "${outdir}/build.log"
	fi
done

# Cleanup is done at this point
if [ "${CLEANONLY}" = "1" ]; then
	exit 0
fi
210
211
212
213
214
215
216





















217

218


219
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240

241
242
243
244
245







+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+

+
+

DATECODE="$(date +%Y%m%d%H%M)"

if [ -z "${PKGHASHCODE}" ]; then
	OUTFILEBASE="tclpkgs-${PLATFORM}-${DATECODE}"
else
	OUTFILEBASE="tclpkgs-${PKGHASHCODE}-${PLATFORM}-${DATECODE}"
fi

rm -rf __tmp__
mkdir __tmp__
instdir="$(cd __tmp__ && pwd)"
for dir in */; do
	basename="$(dirname "${dir}")"
	pkginstdir="${instdir}/${dir}"

	(
		cd "${dir}/out" 2>/dev/null >/dev/null || exit 1

		mkdir "${pkginstdir}"

		cp -r * "${pkginstdir}/"
	)
done

(
	cd __tmp__ || exit 1

	tar -cf - *
tar -cf - */out | bzip2 -9c > "${OUTFILEBASE}.tar.bz2"
) | bzip2 -9c > "${OUTFILEBASE}.tar.bz2"

rm -rf __tmp__

exit 0

Modified server/buildpkgs/common.sh from [80980e80c6] to [ad199373ac].

105
106
107
108
109
110
111
112

113
114
115
105
106
107
108
109
110
111

112
113
114
115







-
+



				"${PATCH:-patch}" -p1 < "${patchfile}"
			)
		done
	done
}

WORKDIR="${TMPDIR:-/tmp}/tcl-buildpkgs-$$${RANDOM}${RANDOM}${RANDOM}"
PLATDIR="$(pwd)/out/${PLATFORM}"
PLATDIR="$(pwd)/out/${VERS}/${PLATFORM}"
export WORKDIR PLATDIR

setup_tcl84