Changeset 38082 in vbox for trunk/src/VBox/Frontends/Common/VBoxKeyboard

Timestamp:

Jul 20, 2011 2:26:24 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

73029

Message:

*.kmk: Installation/staging adjustments (kBuild 0.2.0 preps).

File:

• trunk/src/VBox/Frontends/Common/VBoxKeyboard/Makefile.kmk (modified) (3 diffs)

trunk/src/VBox/Frontends/Common/VBoxKeyboard/Makefile.kmk

@@ -21 +21 @@
 if1of ($(KBUILD_TARGET), freebsd linux openbsd netbsd solaris) # X11
  DLLS        += VBoxKeyboard
- OTHERS      += $(PATH_BIN)/vboxkeyboard.tar.bz2
- OTHER_CLEAN += $(PATH_BIN)/vboxkeyboard.tar.bz2
+ OTHERS      += $(PATH_STAGE_BIN)/vboxkeyboard.tar.bz2
+ OTHER_CLEAN += $(PATH_STAGE_BIN)/vboxkeyboard.tar.bz2
 endif
 
@@ -45 +45 @@
 # but wtf, it's not like we're even trying to be FHS compliant).
 #
-## @todo this should be tar'ed down into the output directory and installed using an install target.
 VBOX_KEYBOARD_STAGE_DIR = $(PATH_TARGET)/VBoxKeyboard/install
 VBOX_KEYBOARD_DEST_DIR = $(VBOX_KEYBOARD_STAGE_DIR)/VBoxKeyboard/
 
+## @todo kBuild need support for copying files into _1_OUTDIR.
 INSTALLS += VBoxKeyboard-Files
-
-VBoxKeyboard-Files_INST    = $(subst $(PATH_TARGET),obj,$(VBOX_KEYBOARD_DEST_DIR))
-VBoxKeyboard-Files_MODE    = a+rx,u+w
-VBoxKeyboard-Files_SOURCES = \
+VBoxKeyboard-Files_INSTTYPE = stage
+VBoxKeyboard-Files_INST     = misc-staging/VBoxKeyboard/
+VBoxKeyboard-Files_MODE     = a+r,u+w
+VBoxKeyboard-Files_SOURCES  = \
                 COPYING.LIB \
                 keyboard.c \
@@ -63 +63 @@
                 ../../../../../include/VBox/VBoxKeyboard.h=>VBox/VBoxKeyboard.h
 
-$(PATH_BIN)/vboxkeyboard.tar.bz2: \
-                $(INSTARGET_VBoxKeyboard-Files) \
-                $(MAKEFILE_CURRENT)
+INSTALLS += VBoxKeyboard-Tarball
+VBoxKeyboard-Tarball_INST    = $(INST_BIN)
+VBoxKeyboard-Tarball_MODE    = a+r,u+w
+VBoxKeyboard-Tarball_SOURCES = $(VBoxKeyboard-Tarball_0_OUTDIR)/vboxkeyboard.tar.bz2
+VBoxKeyboard-Tarball_CLEAN   = $(VBoxKeyboard-Tarball_0_OUTDIR)/vboxkeyboard.tar.bz2
+
+$$(VBoxKeyboard-Tarball_0_OUTDIR)/vboxkeyboard.tar.bz2: \
+                $$(INSTARGET_VBoxKeyboard-Files) \
+                $(MAKEFILE_CURRENT) \
+                | $$(dir $$@)
         $(call MSG_L1,Packing $@)
         $(QUIET)$(RM) -f -- $@ $(patsubst %.bz2,%,$@)
-        $(QUIET)$(MKDIR) -p $(@D)
 ifdef VBOX_GTAR
         $(QUIET)$(VBOX_GTAR) --owner 0 --group 0 --ignore-failed-read -cjRf $@ \
-                -C $(VBOX_KEYBOARD_STAGE_DIR) VBoxKeyboard
+                -C $(PATH_STAGE)/$(VBoxKeyboard-Files_INST).. VBoxKeyboard
 else
         $(QUIET)tar -cjf $@ \
-                -C $(VBOX_KEYBOARD_STAGE_DIR) VBoxKeyboard
+                -C $(PATH_STAGE)/$(VBoxKeyboard-Files_INST).. VBoxKeyboard
 endif
         $(QUIET)$(CHMOD) 0644 $@
 
+
+
 include $(KBUILD_PATH)/subfooter.kmk
+
+