Changeset 8643 in vbox for trunk/src/VBox/Installer

Timestamp:

May 7, 2008 10:24:35 AM (17 years ago)

Author:

vboxsync

Message:

Solaris Installer: fix for SDK conditionally includes and other cleanups.

File:

• trunk/src/VBox/Installer/solaris/Makefile.kmk (modified) (5 diffs)

trunk/src/VBox/Installer/solaris/Makefile.kmk

@@ -46 +46 @@
 solaris-doc_SOURCES = \
         $(if $(VBOX_OSE),,$(PATH_ROOT)/doc/License.txt=>LICENSE)
+
+#
+# Note: Other than the files produced during packing (.pkg, .gzip etc.) all files that
+# go into the temporary install folder $(SOLARISINSTDIR) should be part of $(SOLARISARCHFILES).
+# For the files produced during packing they should be cleaned up promptly when the work is done.
 
 # Strip these binaries
@@ -171 +176 @@
                 vboxdevlink.sed \
                 $(PATH_ROOT)/doc/ReadMe-Solaris.txt \
-                Makefile.kmk
+                Makefile.kmk \
+                $(addprefix $(SOLARISINSTDIR)/,$(SOLARISSDK))
         $(call MSG_L1,Installing binaries $(SOLARISINSTDIR))
+        $(QUIET)$(RM) -f $(addprefix $(SOLARISINSTDIR)/,$(filter-out $(SOLARISDK),$(SOLARISARCHFILES)))
         $(QUIET)$(MKDIR) -p $(SOLARISINSTDIR)/additions
         $(QUIET)$(MKDIR) -p $(SOLARISINSTDIR)/components
@@ -273 +280 @@
         $(QUIET)$(SOLARISINSTDIR)/makepackage.sh $(SOLARISINSTDIR) $(PKGFILENAME) $(BUILD_TARGET_ARCH)
         $(QUIET)$(INSTALL) -m 0755 $(SOLARISINSTDIR)/$(PKGFILENAME).tar.gz $(PATH_BIN)
+        @# Clean up files emitted as side-effect or result of packing
+        $(QUIET)$(RM) -f $(SOLARISINSTDIR)/$(PKGFILENAME).tar.gz
+        $(QUIET)$(RM) -f $(SOLARISINSTDIR)/$(PKGFILENAME).pkg
 
 $(PATH_BIN)/$(DBGARCHIVE): \
@@ -278 +288 @@
                 Makefile.kmk
         $(call MSG_L1,Installing debug binaries $(SOLARISDBGDIR))
-        $(QUIET)rm -rf $(SOLARISDBGDIR)
+        $(QUIET)$(RM) -Rf $(SOLARISDBGDIR)
         $(QUIET)$(MKDIR) -p $(SOLARISDBGDIR)/components
         $(QUIET)$(INSTALL) -m 0644 $(PATH_BIN)/vboxdrv                                                          $(SOLARISDBGDIR)/vboxdrv
@@ -310 +320 @@
         $(QUIET)chmod 0644 $(PATH_BIN)/$(DBGARCHIVE)
 
-# Commented out for now
-#$(addprefix $(SOLARIS_INST_DIR)/,$(SOLARIS_SDK)): $$(subst $$(SOLARIS_INST_DIR)/,$(PATH_BIN)/,$$@)
-#       $(RM) -f $@
-#       $(MKDIR) -p $(@D)
-#       $(CP) -pf $< $@
-
+$(addprefix $(SOLARISINSTDIR)/,$(SOLARISSDK)): $$(subst $$(SOLARISINSTDIR)/,$(PATH_BIN)/,$$@)
+        $(call MSG_L1,Copying $@)
+        $(QUIET)$(MKDIR) -p $(@D)
+        $(QUIET)$(CP) -pf $< $@
+