VirtualBox

Changeset 1523 in kBuild


Ignore:
Timestamp:
Apr 13, 2008 1:57:23 AM (17 years ago)
Author:
bird
Message:

Moved the svn info stuff into config.kmk

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/Config.kmk

    r1522 r1523  
    4040        KBUILD_VERSION_MINOR=$(KBUILD_VERSION_MINOR) \
    4141        KBUILD_VERSION_PATCH=$(KBUILD_VERSION_PATCH)
     42
     43#
     44# Get the svn version.
     45# This is shipped with the tarballs in a SvnInfo.kmk in the root.
     46#
     47ifneq ($(wildcard $(PATH_ROOT)/SvnInfo.kmk),)
     48# Shipped
     49KBUILD_SVN_INFO_KMK := $(PATH_ROOT)/SvnInfo.kmk
     50KBUILD_SVN_INFO_DEP := $(KBUILD_SVN_INFO_KMK)
     51
     52else ifneq ($(wildcard $(PATH_ROOT)/.svn/entries),)
     53# Generate from svn info
     54KBUILD_SVN_INFO_KMK := $(PATH_OBJ)/SvnInfo.kmk
     55KBUILD_SVN_INFO_DEP := $(KBUILD_SVN_INFO_KMK)
     56
     57$(PATH_OBJ)/SvnInfo.ts +| $(KBUILD_SVN_INFO_KMK): $(PATH_ROOT)/.svn/entries $(PATH_ROOT)/.svn/all-wcprops $(PATH_ROOT)/.svn/format
     58        $(call MSG_GENERATE,,$(KBUILD_SVN_INFO_KMK))
     59        @$(RM) -f $@ [email protected]
     60        @$(MKDIR) -p $(@D)
     61        @$(REDIRECT) -o [email protected] -- svn info $(DEPTH)
     62        @$(SED) \
     63                -e 's/URL: */KBUILD_SVN_URL := /' \
     64                -e 's/Revision: */KBUILD_SVN_REV := /' \
     65                -e '/KBUILD_SVN_/!d' \
     66                --append $@ \
     67                [email protected]
     68        @$(RM) -f [email protected]
     69        @$(CP) --changed -fv $@ $(KBUILD_SVN_INFO_KMK)
     70
     71 ifeq ($(DEPTH),.)
     72OTHER_CLEAN += $(KBUILD_SVN_INFO_KMK) $(PATH_OBJ)/SvnInfo.ts
     73 endif
     74
     75else
     76# Some incomplete source export...
     77KBUILD_SVN_INFO_KMK := $(PATH_OBJ)/SvnInfo.kmk
     78KBUILD_SVN_INFO_DEP := $(KBUILD_SVN_INFO_KMK)
     79$(warning Neither SvnInfo nor .svn/* was found in the root. Will have to cook up something too keep the build happy.)
     80$(KBUILD_SVN_INFO_KMK): $(PATH_ROOT)/.svn/entries $(PATH_ROOT)/.svn/all-wcprops $(PATH_ROOT)/.svn/format
     81        $(RM) -f $@
     82        $(APPEND) $@ 'KBUILD_SVN_REV := 0'
     83        $(APPEND) $@ 'KBUILD_SVN_URL := /dev/null'
     84
     85 ifeq ($(DEPTH),.)
     86OTHER_CLEAN += $(KBUILD_SVN_INFO_KMK)
     87 endif
     88
     89endif
     90include $(KBUILD_SVN_INFO_KMK)
     91
    4292
    4393#
    … …  
    195245LIB_KUTIL = $(PATH_OBJ)/src/lib/kUtil/$(TOOL_$(TEMPLATE_LIB_TOOL)_ARLIBPREF)kUtil$(TOOL_$(TEMPLATE_LIB_TOOL)_ARLIBSUFF)
    196246
     247

  • trunk/MakefileMaint.kmk

    r1522 r1523  
    2828include $(PATH_KBUILD)/header.kmk
    2929
    30 #
    31 # Get svn info and parse it bit by bit (cygwin sucks).
    32 #
    33 $(PATH_TARGET)/svn-info.kmk + $(PATH_TARGET)/svn-info.tmp: .svn/entries .svn/all-wcprops .svn/format
    34         $(MKDIR) -p $(@D)
    35         $(RM) -f $@
    36         $(REDIRECT) -o $(PATH_TARGET)/svn-info.tmp -- svn info .
    37         $(SED) -e '/^URL:/!d' -e 's/URL: */KBUILD_SVN_URL :=/' --append $@ $(PATH_TARGET)/svn-info.tmp
    38         $(SED) -e '/^Revision:/!d' -e 's/Revision: */KBUILD_SVN_REV :=/' --append $@ $(PATH_TARGET)/svn-info.tmp
    39 
    40 include $(PATH_TARGET)/svn-info.kmk
    41 
    42 CLEANS += \
    43         $(PATH_TARGET)/svn-info.tmp \
    44         $(PATH_TARGET)/svn-info.kmk
    45 
    4630RMTREE = $(ECHO) todo: $(RM) -Rf
    4731RMTREE = rm -Rf
     32SVN = svn
     33TAR = tar
     34GZIP = gzip
     35
     36ifeq ($(strip $(KBUILD_SVN_INFO_KMK)),)
     37$(error wtf? KBUILD_SVN_INFO_KMK is empty!)
     38endif
    4839
    4940#
    5041# Creates the source tarballs.
    5142#
    52 $(PATH_TARGET)/kBuild-$(KBUILD_VERSION)-src.tar.gz: | $(call DIRDEP,$(PATH_TARGET))
     43$(PATH_TARGET)/kBuild-$(KBUILD_VERSION)-src.tar.gz: | $(call DIRDEP,$(PATH_TARGET)) $(KBUILD_SVN_INFO_DEP)
    5344        $(RM) -f $(PATH_TARGET)/kBuild-$(KBUILD_VERSION)-src.tar $(PATH_TARGET)/kBuild-$(KBUILD_VERSION)-src.tar.gz
    5445        $(RMTREE) $(PATH_TARGET)/kBuild-$(KBUILD_VERSION)/
    55         svn export . $(PATH_TARGET)/kBuild-$(KBUILD_VERSION)/
    56         tar cvf $(PATH_TARGET)/kBuild-$(KBUILD_VERSION)-src.tar -C $(PATH_TARGET) kBuild-$(KBUILD_VERSION)/
    57         gzip -9 $(PATH_TARGET)/kBuild-$(KBUILD_VERSION)-src.tar
     46        $(SVN) export . $(PATH_TARGET)/kBuild-$(KBUILD_VERSION)/
     47        $(INSTALL) $(KBUILD_SVN_INFO_KMK) $(PATH_TARGET)/kBuild-$(KBUILD_VERSION)/SvnInfo.kmk
     48        $(TAR) cvf $(PATH_TARGET)/kBuild-$(KBUILD_VERSION)-src.tar -C $(PATH_TARGET) kBuild-$(KBUILD_VERSION)/
     49        $(GZIP) -9 $(PATH_TARGET)/kBuild-$(KBUILD_VERSION)-src.tar
    5850        $(RMTREE) $(PATH_TARGET)/kBuild-$(KBUILD_VERSION)/
    5951
    60 CLEANS += \
     52OTHER_CLEAN += \
    6153        $(PATH_TARGET)/kBuild-$(KBUILD_VERSION)-src.tar \
    6254        $(PATH_TARGET)/kBuild-$(KBUILD_VERSION)-src.tar.gz
    6355
    6456
    65 $(PATH_TARGET)/kBuild-$(KBUILD_SVN_REV)-src.tar.gz: | $(call DIRDEP,$(PATH_TARGET))
     57$(PATH_TARGET)/kBuild-$(KBUILD_SVN_REV)-src.tar.gz: | $(call DIRDEP,$(PATH_TARGET)) $(KBUILD_SVN_INFO_DEP)
    6658        $(RM) -f $(PATH_TARGET)/kBuild-$(KBUILD_SVN_REV)-src.tar $(PATH_TARGET)/kBuild-$(KBUILD_SVN_REV)-src.tar.gz
    6759        $(RMTREE) $(PATH_TARGET)/kBuild-$(KBUILD_SVN_REV)/
    68         svn export . $(PATH_TARGET)/kBuild-$(KBUILD_SVN_REV)/
    69         tar cvf $(PATH_TARGET)/kBuild-$(KBUILD_SVN_REV)-src.tar -C $(PATH_TARGET) kBuild-$(KBUILD_SVN_REV)/
    70         gzip -9 $(PATH_TARGET)/kBuild-$(KBUILD_SVN_REV)-src.tar
     60        $(SVN) export . $(PATH_TARGET)/kBuild-$(KBUILD_SVN_REV)/
     61        $(INSTALL) $(KBUILD_SVN_INFO_KMK) $(PATH_TARGET)/kBuild-$(KBUILD_SVN_REV)/SvnInfo.kmk
     62        $(TAR) cvf $(PATH_TARGET)/kBuild-$(KBUILD_SVN_REV)-src.tar -C $(PATH_TARGET) kBuild-$(KBUILD_SVN_REV)/
     63        $(GZIP) -9 $(PATH_TARGET)/kBuild-$(KBUILD_SVN_REV)-src.tar
    7164        $(RMTREE) $(PATH_TARGET)/kBuild-$(KBUILD_SVN_REV)/
    7265
    73 CLEANS += \
     66OTHER_CLEAN += \
    7467        $(PATH_TARGET)/kBuild-$(KBUILD_SVN_REV)-src.tar \
    7568        $(PATH_TARGET)/kBuild-$(KBUILD_SVN_REV)-src.tar.gz
    … …  
    8275        $(RMTREE) $(PATH_TARGET)/kBuild-$(KBUILD_VERSION)/
    8376        $(MKDIR) -p $(PATH_TARGET)/kBuild-$(KBUILD_VERSION)
    84         svn export kBuild/ $(PATH_TARGET)/kBuild-$(KBUILD_VERSION)/kBuild/
    85         tar cvf $(PATH_TARGET)/kBuild-$(KBUILD_VERSION).tar -C $(PATH_TARGET) kBuild-$(KBUILD_VERSION)/
    86         gzip -9 $(PATH_TARGET)/kBuild-$(KBUILD_VERSION).tar
     77        $(SVN) export kBuild/ $(PATH_TARGET)/kBuild-$(KBUILD_VERSION)/kBuild/
     78        $(TAR) cvf $(PATH_TARGET)/kBuild-$(KBUILD_VERSION).tar -C $(PATH_TARGET) kBuild-$(KBUILD_VERSION)/
     79        $(GZIP) -9 $(PATH_TARGET)/kBuild-$(KBUILD_VERSION).tar
    8780        $(RMTREE) $(PATH_TARGET)/kBuild-$(KBUILD_VERSION)/
    8881
    89 CLEANS += \
     82OTHER_CLEAN += \
    9083        $(PATH_TARGET)/kBuild-$(KBUILD_VERSION).tar \
    9184        $(PATH_TARGET)/kBuild-$(KBUILD_VERSION).tar.gz
    … …  
    9689        $(RMTREE) $(PATH_TARGET)/kBuild-$(KBUILD_SVN_REV)/
    9790        $(MKDIR) -p $(PATH_TARGET)/kBuild-$(KBUILD_SVN_REV)
    98         svn export kBuild/ $(PATH_TARGET)/kBuild-$(KBUILD_SVN_REV)/kBuild/
    99         tar cvf $(PATH_TARGET)/kBuild-$(KBUILD_SVN_REV).tar -C $(PATH_TARGET) kBuild-$(KBUILD_SVN_REV)/
    100         gzip -9 $(PATH_TARGET)/kBuild-$(KBUILD_SVN_REV).tar
     91        $(SVN) export kBuild/ $(PATH_TARGET)/kBuild-$(KBUILD_SVN_REV)/kBuild/
     92        $(TAR) cvf $(PATH_TARGET)/kBuild-$(KBUILD_SVN_REV).tar -C $(PATH_TARGET) kBuild-$(KBUILD_SVN_REV)/
     93        $(GZIP) -9 $(PATH_TARGET)/kBuild-$(KBUILD_SVN_REV).tar
    10194        $(RMTREE) $(PATH_TARGET)/kBuild-$(KBUILD_SVN_REV)/
    10295
    103 CLEANS += \
     96OTHER_CLEAN += \
    10497        $(PATH_TARGET)/kBuild-$(KBUILD_SVN_REV).tar \
    10598        $(PATH_TARGET)/kBuild-$(KBUILD_SVN_REV).tar.gz
    … …  
    110103#
    111104tarballs: \
     105        $(PATH_TARGET)/kBuild-$(KBUILD_VERSION)-src.tar.gz \
    112106        $(PATH_TARGET)/kBuild-$(KBUILD_VERSION).tar.gz \
    113         $(PATH_TARGET)/kBuild-$(KBUILD_VERSION)-src.tar.gz \
    114107        $(PATH_TARGET)/kBuild-$(KBUILD_SVN_REV).tar.gz \
    115108        $(PATH_TARGET)/kBuild-$(KBUILD_SVN_REV)-src.tar.gz
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette