Changeset 471569b in mainline

Timestamp:

2011-03-16T22:09:28Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

406d514

Parents:

aede651

Message:

Rename things 'dist' to 'release'.

Files:

• Makefile (modified) (2 diffs)
• release/Makefile (moved) (moved from dist/Makefile ) (3 diffs)

Makefile

@@ -42 +42 @@
 CONFIG_HEADER = config.h
 
-.PHONY: all precheck cscope autotool config_auto config_default config distclean clean check distfile dist
+.PHONY: all precheck cscope autotool config_auto config_default config distclean clean check releasefile release
 
 all: $(COMMON_MAKEFILE) $(COMMON_HEADER) $(CONFIG_MAKEFILE) $(CONFIG_HEADER)
@@ -88 +88 @@
         $(CONFIG) $<
 
-# Distribution files
+# Release files
 
-distfile: all
-        $(MAKE) -C dist distfile
+releasefile: all
+        $(MAKE) -C release releasefile
 
-dist:
-        $(MAKE) -C dist dist
+release:
+        $(MAKE) -C release release
 
 # Cleaning

release/Makefile

@@ -39 +39 @@
 TAR = tar
 
-# To determine IMGFILE
+# To determine IMG_FILE
 -include $(EXPORT_DIR)/Makefile.config
 -include $(EXPORT_DIR)/boot/arch/$(BARCH)/Makefile.inc
@@ -45 +45 @@
 
 ifdef POST_OUTPUT
-        IMGFILE = $(EXPORT_DIR)/boot/$(POST_OUTPUT)
+        IMG_FILE = $(EXPORT_DIR)/boot/$(POST_OUTPUT)
 else
-        IMGFILE = $(EXPORT_DIR)/boot/$(BOOT_OUTPUT)
+        IMG_FILE = $(EXPORT_DIR)/boot/$(BOOT_OUTPUT)
 endif
 
-SUFFIX = $(suffix $(IMGFILE))
+SUFFIX = $(suffix $(IMG_FILE))
 
 ifdef PROFILE
-        DISTFILE = HelenOS-$(RELEASE)-$(shell echo $(PROFILE) | tr '/' '-')$(SUFFIX)
+        RELEASE_FILE = HelenOS-$(RELEASE)-$(shell echo $(PROFILE) | tr '/' '-')$(SUFFIX)
 else
-        DISTFILE = HelenOS-$(RELEASE)-$(PLATFORM)-$(MACHINE)-$(PROCESSOR)$(SUFFIX)
+        RELEASE_FILE = HelenOS-$(RELEASE)-$(PLATFORM)-$(MACHINE)-$(PROCESSOR)$(SUFFIX)
 endif
 
-.PHONY: all clean dist distfile export srcdist
+.PHONY: all clean release releasefile export srcrel
 
-all: distfile
-distfile: $(DISTFILE)
+all: releasefile
+releasefile: $(RELEASE_FILE)
 
-$(DISTFILE): $(IMGFILE)
+$(RELEASE_FILE): $(IMG_FILE)
         cp $< $@
 
-$(IMGFILE):
+$(IMG_FILE):
         $(MAKE) -C $(EXPORT_DIR)
 
-dist: src_dist
+release: src_rel
         for profile in $(PROFILES); do \
                 $(MAKE) -C $(EXPORT_DIR) clean ; \
                 $(MAKE) -C $(EXPORT_DIR) PROFILE=$$profile ; \
-                $(MAKE) PROFILE=$$profile distfile ; \
+                $(MAKE) PROFILE=$$profile releasefile ; \
         done
 
@@ -81 +81 @@
         $(BZR) export $(EXPORT_DIR)
 
-src_dist $(SRC_ARCHIVE): export
+src_rel $(SRC_ARCHIVE): export
         $(TAR) -C $(shell dirname $(EXPORT_DIR)) \
             -cjf $(SRC_ARCHIVE) $(shell basename $(EXPORT_DIR))
 
 clean:
-        rm -f $(DISTFILE)
+        rm -f $(RELEASE_FILE)