From 2d76ea7cf8dfd987a951464ede28fd04736ef98e Mon Sep 17 00:00:00 2001 From: lars Date: Mon, 9 May 2005 22:19:17 +0000 Subject: [PATCH] Erzeugung eines stable-Release notduerftig repariert --- v1.1/Makefile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/v1.1/Makefile b/v1.1/Makefile index 9d7275a..4f557b9 100644 --- a/v1.1/Makefile +++ b/v1.1/Makefile @@ -26,6 +26,7 @@ ERZEUGE_ISO = mkisofs $(ISO_OPTS) -o $(EXPORT_FILE).iso $(TMP_DIR) 2>&1 | $(EINR # Sonstiges ISO_OPTS = -iso-level 3 -J -joliet-long -relaxed-filenames -f -r -V $(EXPORT_PREFIX)$(REVISIONS_SUFFIX) EINRUECKEN = sed 's/^/\t/' +REPOS_URL = https://svn.systemausfall.org/svn/cryptocd # Voreinstellungen ARBEITS_REVISION = $(AKTUELLE_REVISION) @@ -35,7 +36,7 @@ EXPORT_FILE_SUFFIX := undefiniert ####### Allgemeine targets ########### -.PHONY : clean all doku check help website website-stable release release-stable source source-stable export-all erzeuge_mirror release_all release_all-stable setze_releaseinfos hole_svn_export svn_erzeuge_links verlinke_programme verlinke_chaosradio +.PHONY : clean all doku check help website website-stable release release-stable source source-stable export-all erzeuge_mirror release_all release_all-stable setze_releaseinfos hole_svn_export svn_erzeuge_links verlinke_programme verlinke_chaosradio check_progs all: doku @@ -85,19 +86,19 @@ setze_releaseinfos: erzeuge_mirror @echo "Passe version.txt an ..." @cat version.txt | sed 's/REVISIONS_PLATZHALTER/$(ARBEITS_REVISION)/g; s/DATUMS_PLATZHALTER/$(REVISIONS_DATUM)/g' >$(TMP_DIR)/version.txt @echo "Erzeuge changelog.txt ..." - @svn log -r $(ARBEITS_REVISION):1 >$(TMP_DIR)/changelog.txt + @svn log -r $(ARBEITS_REVISION):1 $(REPOS_URL) >$(TMP_DIR)/changelog.txt hole_quell_daten: - @if [ ! -e "$(MIRROR_QUELLE_DIR)" ] ;\ + if [ ! -e "$(MIRROR_QUELLE_DIR)" ] ;\ then mkdir -p $(shell dirname "$(MIRROR_QUELLE_DIR)") ;\ echo "Exportiere die gewaehlte svn-Revision ($(ARBEITS_REVISION)) ..." ;\ - svn export -r $(ARBEITS_REVISION) . "$(MIRROR_QUELLE_DIR)" | $(EINRUECKEN) ;\ + svn export -r $(ARBEITS_REVISION) "$(REPOS_URL)" "$(MIRROR_QUELLE_DIR)" | $(EINRUECKEN) ;\ else echo "Verwende existierende lokale svn-Kopie" ;\ fi verlinke_programme: erzeuge_mirror @echo "Erzeuge Links zu den Programmen ..." - @[ -e "$(ROOT_DIR)/programme" ] && ln -s "$(ROOT_DIR)/programme" "$(TMP_DIR)" || (echo "Fehler: kein Programm-Verzeichnis ($(ROOT_DIR)/programme) gefunden!" >&2 ; false ) + @[ -e "$(PROG_DIR)" ] && ln -s "$(PROG_DIR)" "$(TMP_DIR)" || (echo "Fehler: kein Programm-Verzeichnis ($(PROG_DIR)) gefunden!" >&2 ; false ) verlinke_chaosradio: erzeuge_mirror @echo "Erzeuge Links zu den ChaosRadio-Dateien ..."