Changeset 1523 for trunk/MakefileMaint.kmk

Timestamp:

Apr 13, 2008, 3:57:23 AM (17 years ago)

Author:

bird

Message:

Moved the svn info stuff into config.kmk

File:

• trunk/MakefileMaint.kmk (modified) (4 diffs)

trunk/MakefileMaint.kmk

@@ -28 +28 @@
 include $(PATH_KBUILD)/header.kmk
 
-#
-# Get svn info and parse it bit by bit (cygwin sucks).
-#
-$(PATH_TARGET)/svn-info.kmk + $(PATH_TARGET)/svn-info.tmp: .svn/entries .svn/all-wcprops .svn/format
-        $(MKDIR) -p $(@D)
-        $(RM) -f $@
-        $(REDIRECT) -o $(PATH_TARGET)/svn-info.tmp -- svn info .
-        $(SED) -e '/^URL:/!d' -e 's/URL: */KBUILD_SVN_URL :=/' --append $@ $(PATH_TARGET)/svn-info.tmp
-        $(SED) -e '/^Revision:/!d' -e 's/Revision: */KBUILD_SVN_REV :=/' --append $@ $(PATH_TARGET)/svn-info.tmp
-
-include $(PATH_TARGET)/svn-info.kmk
-
-CLEANS += \
-        $(PATH_TARGET)/svn-info.tmp \
-        $(PATH_TARGET)/svn-info.kmk 
-
 RMTREE = $(ECHO) todo: $(RM) -Rf
 RMTREE = rm -Rf
+SVN = svn
+TAR = tar
+GZIP = gzip
+
+ifeq ($(strip $(KBUILD_SVN_INFO_KMK)),)
+$(error wtf? KBUILD_SVN_INFO_KMK is empty!)
+endif
 
 #
 # Creates the source tarballs.
 #
-$(PATH_TARGET)/kBuild-$(KBUILD_VERSION)-src.tar.gz: | $(call DIRDEP,$(PATH_TARGET))
+$(PATH_TARGET)/kBuild-$(KBUILD_VERSION)-src.tar.gz: | $(call DIRDEP,$(PATH_TARGET)) $(KBUILD_SVN_INFO_DEP)
         $(RM) -f $(PATH_TARGET)/kBuild-$(KBUILD_VERSION)-src.tar $(PATH_TARGET)/kBuild-$(KBUILD_VERSION)-src.tar.gz
         $(RMTREE) $(PATH_TARGET)/kBuild-$(KBUILD_VERSION)/
-        svn export . $(PATH_TARGET)/kBuild-$(KBUILD_VERSION)/
-        tar cvf $(PATH_TARGET)/kBuild-$(KBUILD_VERSION)-src.tar -C $(PATH_TARGET) kBuild-$(KBUILD_VERSION)/
-        gzip -9 $(PATH_TARGET)/kBuild-$(KBUILD_VERSION)-src.tar
+        $(SVN) export . $(PATH_TARGET)/kBuild-$(KBUILD_VERSION)/
+        $(INSTALL) $(KBUILD_SVN_INFO_KMK) $(PATH_TARGET)/kBuild-$(KBUILD_VERSION)/SvnInfo.kmk
+        $(TAR) cvf $(PATH_TARGET)/kBuild-$(KBUILD_VERSION)-src.tar -C $(PATH_TARGET) kBuild-$(KBUILD_VERSION)/
+        $(GZIP) -9 $(PATH_TARGET)/kBuild-$(KBUILD_VERSION)-src.tar
         $(RMTREE) $(PATH_TARGET)/kBuild-$(KBUILD_VERSION)/
 
-CLEANS += \
+OTHER_CLEAN += \
         $(PATH_TARGET)/kBuild-$(KBUILD_VERSION)-src.tar \
         $(PATH_TARGET)/kBuild-$(KBUILD_VERSION)-src.tar.gz
 
 
-$(PATH_TARGET)/kBuild-$(KBUILD_SVN_REV)-src.tar.gz: | $(call DIRDEP,$(PATH_TARGET))
+$(PATH_TARGET)/kBuild-$(KBUILD_SVN_REV)-src.tar.gz: | $(call DIRDEP,$(PATH_TARGET)) $(KBUILD_SVN_INFO_DEP)
         $(RM) -f $(PATH_TARGET)/kBuild-$(KBUILD_SVN_REV)-src.tar $(PATH_TARGET)/kBuild-$(KBUILD_SVN_REV)-src.tar.gz
         $(RMTREE) $(PATH_TARGET)/kBuild-$(KBUILD_SVN_REV)/
-        svn export . $(PATH_TARGET)/kBuild-$(KBUILD_SVN_REV)/
-        tar cvf $(PATH_TARGET)/kBuild-$(KBUILD_SVN_REV)-src.tar -C $(PATH_TARGET) kBuild-$(KBUILD_SVN_REV)/
-        gzip -9 $(PATH_TARGET)/kBuild-$(KBUILD_SVN_REV)-src.tar
+        $(SVN) export . $(PATH_TARGET)/kBuild-$(KBUILD_SVN_REV)/
+        $(INSTALL) $(KBUILD_SVN_INFO_KMK) $(PATH_TARGET)/kBuild-$(KBUILD_SVN_REV)/SvnInfo.kmk
+        $(TAR) cvf $(PATH_TARGET)/kBuild-$(KBUILD_SVN_REV)-src.tar -C $(PATH_TARGET) kBuild-$(KBUILD_SVN_REV)/
+        $(GZIP) -9 $(PATH_TARGET)/kBuild-$(KBUILD_SVN_REV)-src.tar
         $(RMTREE) $(PATH_TARGET)/kBuild-$(KBUILD_SVN_REV)/
 
-CLEANS += \
+OTHER_CLEAN += \
         $(PATH_TARGET)/kBuild-$(KBUILD_SVN_REV)-src.tar \
         $(PATH_TARGET)/kBuild-$(KBUILD_SVN_REV)-src.tar.gz
@@ -82 +75 @@
         $(RMTREE) $(PATH_TARGET)/kBuild-$(KBUILD_VERSION)/
         $(MKDIR) -p $(PATH_TARGET)/kBuild-$(KBUILD_VERSION)
-        svn export kBuild/ $(PATH_TARGET)/kBuild-$(KBUILD_VERSION)/kBuild/
-        tar cvf $(PATH_TARGET)/kBuild-$(KBUILD_VERSION).tar -C $(PATH_TARGET) kBuild-$(KBUILD_VERSION)/
-        gzip -9 $(PATH_TARGET)/kBuild-$(KBUILD_VERSION).tar
+        $(SVN) export kBuild/ $(PATH_TARGET)/kBuild-$(KBUILD_VERSION)/kBuild/
+        $(TAR) cvf $(PATH_TARGET)/kBuild-$(KBUILD_VERSION).tar -C $(PATH_TARGET) kBuild-$(KBUILD_VERSION)/
+        $(GZIP) -9 $(PATH_TARGET)/kBuild-$(KBUILD_VERSION).tar
         $(RMTREE) $(PATH_TARGET)/kBuild-$(KBUILD_VERSION)/
 
-CLEANS += \
+OTHER_CLEAN += \
         $(PATH_TARGET)/kBuild-$(KBUILD_VERSION).tar \
         $(PATH_TARGET)/kBuild-$(KBUILD_VERSION).tar.gz
@@ -96 +89 @@
         $(RMTREE) $(PATH_TARGET)/kBuild-$(KBUILD_SVN_REV)/
         $(MKDIR) -p $(PATH_TARGET)/kBuild-$(KBUILD_SVN_REV)
-        svn export kBuild/ $(PATH_TARGET)/kBuild-$(KBUILD_SVN_REV)/kBuild/
-        tar cvf $(PATH_TARGET)/kBuild-$(KBUILD_SVN_REV).tar -C $(PATH_TARGET) kBuild-$(KBUILD_SVN_REV)/
-        gzip -9 $(PATH_TARGET)/kBuild-$(KBUILD_SVN_REV).tar
+        $(SVN) export kBuild/ $(PATH_TARGET)/kBuild-$(KBUILD_SVN_REV)/kBuild/
+        $(TAR) cvf $(PATH_TARGET)/kBuild-$(KBUILD_SVN_REV).tar -C $(PATH_TARGET) kBuild-$(KBUILD_SVN_REV)/
+        $(GZIP) -9 $(PATH_TARGET)/kBuild-$(KBUILD_SVN_REV).tar
         $(RMTREE) $(PATH_TARGET)/kBuild-$(KBUILD_SVN_REV)/
 
-CLEANS += \
+OTHER_CLEAN += \
         $(PATH_TARGET)/kBuild-$(KBUILD_SVN_REV).tar \
         $(PATH_TARGET)/kBuild-$(KBUILD_SVN_REV).tar.gz
@@ -110 +103 @@
 #
 tarballs: \
+        $(PATH_TARGET)/kBuild-$(KBUILD_VERSION)-src.tar.gz \
         $(PATH_TARGET)/kBuild-$(KBUILD_VERSION).tar.gz \
-        $(PATH_TARGET)/kBuild-$(KBUILD_VERSION)-src.tar.gz \
         $(PATH_TARGET)/kBuild-$(KBUILD_SVN_REV).tar.gz \
         $(PATH_TARGET)/kBuild-$(KBUILD_SVN_REV)-src.tar.gz