Changeset aede651 in mainline

Timestamp:

2011-03-16T21:46:58Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

471569b

Parents:

c1a5d8d

Message:

Build release files from exported sources. Build source tarball as well.

File:

• dist/Makefile (modified) (4 diffs)

dist/Makefile

@@ -28 +28 @@
 
 -include ../version
--include ../Makefile.config
--include ../boot/arch/$(BARCH)/Makefile.inc
--include ../boot/Makefile.common
+
+EXPORT_DIR = /var/tmp/helenos/HelenOS-$(RELEASE)
+SRC_ARCHIVE = HelenOS-$(RELEASE).tar.bz2
 
 PROFILES = amd64 arm32/GXemul arm32/integratorcp arm32/gta02 ia32 \
@@ -36 +36 @@
     sparc64/serengeti sparc64/ultra
 
+BZR = bzr
+TAR = tar
+
+# To determine IMGFILE
+-include $(EXPORT_DIR)/Makefile.config
+-include $(EXPORT_DIR)/boot/arch/$(BARCH)/Makefile.inc
+-include $(EXPORT_DIR)/boot/Makefile.common
+
 ifdef POST_OUTPUT
-        IMGFILE = $(POST_OUTPUT)
+        IMGFILE = $(EXPORT_DIR)/boot/$(POST_OUTPUT)
 else
-        IMGFILE = $(BOOT_OUTPUT)
+        IMGFILE = $(EXPORT_DIR)/boot/$(BOOT_OUTPUT)
 endif
 
@@ -45 +53 @@
 
 ifdef PROFILE
-        DISTFILE = Helenos-$(shell echo $(PROFILE) | tr '/' '-')$(SUFFIX)
+        DISTFILE = HelenOS-$(RELEASE)-$(shell echo $(PROFILE) | tr '/' '-')$(SUFFIX)
 else
         DISTFILE = HelenOS-$(RELEASE)-$(PLATFORM)-$(MACHINE)-$(PROCESSOR)$(SUFFIX)
 endif
 
-.PHONY: all clean dist distfile
+.PHONY: all clean dist distfile export srcdist
 
 all: distfile
@@ -59 +67 @@
 
 $(IMGFILE):
-        $(MAKE) -C ..
+        $(MAKE) -C $(EXPORT_DIR)
 
-dist:
+dist: src_dist
         for profile in $(PROFILES); do \
-                $(MAKE) -C .. clean ; \
-                $(MAKE) -C .. PROFILE=$$profile distfile ; \
+                $(MAKE) -C $(EXPORT_DIR) clean ; \
+                $(MAKE) -C $(EXPORT_DIR) PROFILE=$$profile ; \
+                $(MAKE) PROFILE=$$profile distfile ; \
         done
+
+$(EXPORT_DIR) export:
+        rm -rf $(EXPORT_DIR)
+        mkdir -p $(EXPORT_DIR)
+        $(BZR) export $(EXPORT_DIR)
+
+src_dist $(SRC_ARCHIVE): export
+        $(TAR) -C $(shell dirname $(EXPORT_DIR)) \
+            -cjf $(SRC_ARCHIVE) $(shell basename $(EXPORT_DIR))
 
 clean: