Changeset 8633 in vbox for trunk/src

Timestamp:

May 6, 2008 5:01:30 PM (17 years ago)

Author:

vboxsync

Message:

Solaris installer: attempt to pack SDK conditionally for excluding tstVBoxAPILinux.
Has some other fixes as well.

Location:

trunk/src/VBox/Installer/solaris

Files:

• Makefile.kmk (modified) (9 diffs)
• sdkfiles (added)

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

@@ -27 +27 @@
 endif
 
+SOLARISINSTDIR  := $(PATH_TARGET)/install
+SOLARISDBGDIR   := $(PATH_TARGET)/installdbg
 PKGINFO_ARCH     = $(shell uname -p)
 PKGFILENAME      = VirtualBox-$(VBOX_VERSION_STRING)-SunOS-$(BUILD_TARGET_ARCH)-r$(VBOX_SVN_REV)
 DBGARCHIVE       = VirtualBox-dbg.tar.bz2
 PACKING          = $(PATH_BIN)/$(PKGFILENAME).tar.gz $(PATH_BIN)/$(DBGARCHIVE)
-OTHER_CLEAN      = $(addprefix $(PATH_TARGET)/install/,vbox.pkginfo vbox.pkgresponse ReadMe.txt \
-                                                                makepackage.sh vboxdrv vboxdrv.conf prototype \
-                                                                vboxdrv.sh postinstall.sh preremove.sh VBox.sh vnic_setup.sh vnic_term.sh)
+OTHER_CLEAN      = $(addprefix $(SOLARISINSTDIR)/,vbox.pkginfo vbox.space vbox.pkgresponse \
+                                                                makepackage.sh prototype postinstall.sh preremove.sh etc/devlink.tab)
 
 INSTALLS             = solaris-doc
@@ -91 +92 @@
         $(if $(and $(not $(VBOX_OSE)),$(VBOX_WITH_QTGUI)),License-$(VBOX_LICENSE_VER).html) \
         components/VBoxXPCOMBase.xpt \
-        components/VirtualBox_XPCOM.xpt
+        components/VirtualBox_XPCOM.xpt \
+        autoresponse \
+        vboxdrv.conf \
+        vboxdrv.sh \
+        VBox.sh \
+        vnic_setup.sh \
+        vnic_term.sh \
+        ReadMe.txt
 
 SOLARISNLS = \
@@ -99 +107 @@
           nls/VirtualBox_$(f).qm nls/qt_$(f).qm),)
 
+SOLARISSDK = \
+        $(if $(VBOX_WITH_QTGUI),$(foreach f,\
+          $(shell $(CAT_EXT) \
+                sdkfiles),\
+          $(f)),)
+
+SOLARISNLS = \
+        $(if $(VBOX_WITH_QTGUI),$(foreach f,\
+          $(shell $(CAT_EXT) \
+                $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.txt),\
+          nls/VirtualBox_$(f).qm nls/qt_$(f).qm),)
+
 ifdef VBOX_WITH_DOCS
  ifndef $(VBOX_OSE)
@@ -120 +140 @@
         VBoxHeadless
 endif
-
-
-SOLARISARCHFILES := $(SOLARISSTRIPBIN) $(SOLARISSTRIPOBJ) $(SOLARISNOSTRIP) $(SOLARISNLS)
-SOLARISINSTDIR := $(PATH_TARGET)/install
-SOLARISDBGDIR :=  $(PATH_TARGET)/installdbg
+ifdef VBOX_WITH_WEBSERVICES
+ SOLARISSTRIPBIN += \
+        vboxwebsrv \
+        webtest
+endif
+
+# Guest Additions
+SOLARISNOSTRIP += \
+        $(if $(VBOX_OSE),,additions/VBoxGuestAdditions.iso)
+
+SOLARISARCHFILES := $(SOLARISSTRIPBIN) $(SOLARISSTRIPOBJ) $(SOLARISNOSTRIP) $(SOLARISNLS) $(SOLARISSDK)
 
 OTHER_CLEAN += $(addprefix $(SOLARISINSTDIR)/,$(SOLARISARCHFILES)) \
                                 $(SOLARISINSTDIR)/$(PKGFILENAME).tar.gz \
-                                $(PATH_BIN)/$(PKGFILENAME).tar.gz \
+                                $(SOLARISINSTDIR)/$(PKGFILENAME).pkg \
                                 $(addprefix $(SOLARISDBGDIR)/,$(SOLARISSTRIPBIN)) \
                                 $(SOLARISDBGDIR)/$(DBGARCHIVE)
@@ -136 +162 @@
 
 $(PATH_BIN)/$(PKGFILENAME).tar.gz: \
+                $(addprefix $(SOLARISINSTDIR)/,$(SOLARISSDK)) \
                 $(VBOX_VERSION_STAMP) \
                 makepackage.sh \
@@ -141 +168 @@
                 preremove.sh \
                 vbox.pkginfo \
+                vbox.space \
                 vbox.pkgresponse \
                 vboxdevlink.sed \
-                vboxdrv.sh \
-                VBox.sh \
                 $(PATH_ROOT)/doc/ReadMe-Solaris.txt \
                 Makefile.kmk
         $(call MSG_L1,Installing binaries $(SOLARISINSTDIR))
-        @# Clear out the existing package files if needed
-        $(QUIET)rm -rf $(SOLARISINSTDIR)
         $(QUIET)$(MKDIR) -p $(SOLARISINSTDIR)/additions
         $(QUIET)$(MKDIR) -p $(SOLARISINSTDIR)/components
@@ -227 +251 @@
         $(QUIET)$(INSTALL) -m 0755 $(PATH_BIN)/components/VirtualBox_XPCOM.xpt                                  $(SOLARISINSTDIR)/components/VirtualBox_XPCOM.xpt
         $(QUIET)$(if $(VBOX_WITH_QTGUI),$(CP) $(foreach f,$(SOLARISNLS),$(PATH_BIN)/$(f)) $(SOLARISINSTDIR)/nls,)
-        $(QUIET)$(if $(VBOX_WITH_QTGUI),cp -p -L -R $(PATH_BIN)/sdk $(SOLARISINSTDIR),)
         $(QUIET)$(if $(VBOX_WITH_WEBSERVICES),$(INSTALL) -m 0755 $(if $(VBOX_DO_STRIP),-s,) $(PATH_BIN)/vboxwebsrv $(SOLARISINSTDIR)/vboxwebsrv,)
         $(QUIET)$(if $(VBOX_WITH_WEBSERVICES),$(INSTALL) -m 0755 $(if $(VBOX_DO_STRIP),-s,) $(PATH_BIN)/webtest    $(SOLARISINSTDIR)/webtest,)  
@@ -253 +276 @@
 
 $(PATH_BIN)/$(DBGARCHIVE): \
+                $(addprefix $(SOLARISINSTDIR)/,$(SOLARISSTRIPBIN)) \
                 $(VBOX_VERSION_STAMP) \
                 Makefile.kmk
@@ -282 +306 @@
         $(QUIET)$(if $(VBOX_WITH_HEADLESS),$(INSTALL) -m 0755 $(PATH_BIN)/VBoxHeadless                          $(SOLARISDBGDIR)/VBoxHeadless,)
         $(QUIET)$(if $(VBOX_WITH_DEBUGGER_GUI),$(INSTALL) -m 0644 $(PATH_BIN)/VBoxDbg.so                        $(SOLARISDBGDIR)/VBoxDbg.so,)
+        $(QUIET)$(if $(VBOX_WITH_WEBSERVICES),$(INSTALL) -m 0644 $(PATH_BIN)/vboxwebsrv                         $(SOLARISDBGDIR)/vboxwebsrv,)
+        $(QUIET)$(if $(VBOX_WITH_WEBSERVICES),$(INSTALL) -m 0644 $(PATH_BIN)/webtest                            $(SOLARISDBGDIR)/webtest,)
         $(call MSG_L1,Packing $@)
         $(QUIET)/usr/sfw/bin/gtar --owner 0 --group 0 -cjRhf $(PATH_BIN)/$(DBGARCHIVE) -C $(SOLARISDBGDIR) $(SOLARISSTRIPBIN)
         $(QUIET)chmod 0644 $(PATH_BIN)/$(DBGARCHIVE)
 
+$(addprefix $(SOLARIS_INST_DIR)/,$(SOLARIS_SDK)): $$(subst $$(SOLARIS_INST_DIR)/,$(PATH_BIN)/,$$@)
+        $(RM) -f $@
+        $(MKDIR) -p $(@D)
+        $(CP) -pf $< $@
+