[Lsb-messages] /var/www/bzr/lsb/devel/repogen r199: Integrate the new Debian process into the top-level Makefile.

[Jeff Licquia]

------------------------------------------------------------
revno: 199
committer: Jeff Licquia <licquia at linuxfoundation.org>
branch nick: repogen
timestamp: Thu 2013-06-13 10:24:40 -0700
message:
  Integrate the new Debian process into the top-level Makefile.
modified:
  Makefile
  deb/Makefile-haskell
-------------- next part --------------
=== modified file 'Makefile'
--- a/Makefile	2013-06-13 15:08:47 +0000
+++ b/Makefile	2013-06-13 17:24:40 +0000
@@ -3,24 +3,25 @@
 
 include Makefile.common
 
-ifeq ($(BUILD_DEBIAN),no)
-DEB_TARGET = 
-else
-DEB_TARGET = deb
-endif
-
-PROJECTS = rpm $(DEB_TARGET)
-
 default: pkglists
 ifeq ($(BUILD_RELEASED),yes)
-	for prj in $(PROJECTS); do cd $$prj; for lv in $(LSB_VERSIONS); do $(MAKE) LSB_VERSION=$$lv; done; cd ..; done
+	cd rpm; for lv in $(LSB_VERSIONS); do $(MAKE) LSB_VERSION=$$lv; done
+ifeq ($(BUILD_DEBIAN),yes)
+	cd deb; make -f Makefile-haskell
+endif
 endif
 ifeq ($(BUILD_BETA),yes)
-	for prj in $(PROJECTS); do cd $$prj; $(MAKE) LSB_VERSION=$(BETA_LSB_VERSION) VERSION_PATH=beta COMMON_PATH=beta REPO_NAME=lsb-beta YUM_REPO_DIR=lsb-beta; cd ..; done
+	cd rpm; $(MAKE) LSB_VERSION=$(BETA_LSB_VERSION) VERSION_PATH=beta COMMON_PATH=beta REPO_NAME=lsb-beta YUM_REPO_DIR=lsb-beta
+ifeq ($(BUILD_DEBIAN),yes)
+	echo "no Debian beta repositories yet"
+endif
 endif
 
 snapshot: pkglists
-	for prj in $(PROJECTS); do cd $$prj; $(MAKE) snapshot LSB_VERSION=$(SNAPSHOT_LSB_VERSION) COMMON_PATH=snapshots VERSION_PATH=snapshots APPBAT_PATH=snapshots DISTTEST_PATH=snapshots LSBDEV_PATH=snapshots APPTEST_PATH=snapshots; cd ..; done
+	cd rpm; $(MAKE) snapshot LSB_VERSION=$(SNAPSHOT_LSB_VERSION) COMMON_PATH=snapshots VERSION_PATH=snapshots APPBAT_PATH=snapshots DISTTEST_PATH=snapshots LSBDEV_PATH=snapshots APPTEST_PATH=snapshots
+ifeq ($(BUILD_DEBIAN),yes)
+	cd deb; $(MAKE) -f Makefile-haskell snapshot
+endif
 
 pkglists: task-pkgs.tar.gz
 	zcat task-pkgs.tar.gz | tar xf - -O task-pkgs/package/pkglists > $@
@@ -28,32 +29,22 @@
 task-pkgs.tar.gz:
 	bzr export $@ http://bzr.linuxfoundation.org/lsb/devel/task-pkgs
 
-debcache: $(DEB_PKG_CACHE)
-
-$(DEB_PKG_CACHE): pkglists
-ifeq ($(BUILD_RELEASED),yes)
-	for lv in $(LSB_VERSIONS); do cd deb; $(MAKE) debcache LSB_VERSION=$$lv; cd ..; done
-endif
-ifeq ($(BUILD_BETA),yes)
-	cd deb && $(MAKE) debcache LSB_VERSION=$(BETA_LSB_VERSION) VERSION_PATH=beta
-endif
-
-debcache-snapshot: pkglists
-	cd deb && $(MAKE) debcache-snapshot LSB_VERSION=$(SNAPSHOT_LSB_VERSION) VERSION_PATH=snapshots APPBAT_PATH=snapshots DISTTEST_PATH=snapshots LSBDEV_PATH=snapshots APPTEST_PATH=snapshots
-
 clean:
 	for prj in rpm deb; do cd $$prj; $(MAKE) clean; cd ..; done
 	rm -f pkglists task-pkgs.tar.gz *.hi
 
 install:
 ifeq ($(BUILD_RELEASED),yes)
-	for prj in $(PROJECTS); do cd $$prj; for lv in $(LSB_VERSIONS); do $(MAKE) install LSB_VERSION=$$lv; done; cd ..; done
+	cd rpm; for lv in $(LSB_VERSIONS); do $(MAKE) install LSB_VERSION=$$lv; done
 endif
 ifeq ($(BUILD_BETA),yes)
-	for prj in $(PROJECTS); do cd $$prj; $(MAKE) install LSB_VERSION=$(BETA_LSB_VERSION) REPO_NAME=lsb-beta YUM_REPO_DIR=lsb-beta; cd ..; done
+	cd rpm; $(MAKE) install LSB_VERSION=$(BETA_LSB_VERSION) REPO_NAME=lsb-beta YUM_REPO_DIR=lsb-beta
 endif
 
 install-snapshot:
-	for prj in $(PROJECTS); do cd $$prj; $(MAKE) install LSB_VERSION=$(SNAPSHOT_LSB_VERSION); cd ..; done
+	cd rpm; $(MAKE) install LSB_VERSION=$(SNAPSHOT_LSB_VERSION)
+ifeq ($(BUILD_DEBIAN),yes)
+	cd deb; $(MAKE) -f Makefile-haskell install-snapshot
+endif
 
 .PHONY: default snapshot debcache debcache-snapshot clean install install-snapshot

=== modified file 'deb/Makefile-haskell'
--- a/deb/Makefile-haskell	2013-06-13 14:57:38 +0000
+++ b/deb/Makefile-haskell	2013-06-13 17:24:40 +0000
@@ -7,6 +7,10 @@
     debian/dists/lsb-3.2/Release debian/dists/lsb-4.0/Release \
     debian/dists/lsb-4.1/Release
 
+snapshot: debian/dists/lsb-snapshot/Release
+
+snapshot-signed: debian/dists/lsb-snapshot/Release.gpg
+
 missingdebs: ../Package.hs missingdebs.hs
 	ghc -v0 -i.. --make $@