Changeset 38093 in vbox for trunk/src/VBox/Main

Timestamp:

Jul 21, 2011 12:45:30 PM (14 years ago)

Author:

vboxsync

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

73042

Message:

*.kmk,++: Mode fixes to maximize hardlinking potential during staging.

Location:

trunk/src/VBox/Main

Files:

• Makefile.kmk (modified) (6 diffs)
• webservice/Makefile.kmk (modified) (1 diff)

trunk/src/VBox/Main/Makefile.kmk

@@ -161 +161 @@
 INSTALLS += VBox-main-xidl
 VBox-main-xidl_INST = $(INST_SDK)bindings/
+VBox-main-xidl_MODE = a+r,u+w
 VBox-main-xidl_SOURCES = $(VBOX_XIDL_FILE_SRC)
 
 ifdef VBOX_WITH_PYTHON
-
-# or to some subdir?
-VBOX_PYTHON_CONSTANTS = $(PATH_TARGET)/VirtualBox_constants.py
-
 INSTALLS += VBox-python-glue
-VBox-python-glue_INST = $(INST_SDK)installer/
-VBox-python-glue_SOURCES = glue/vboxapi.py=>vboxapi/__init__.py  \
-                           $(VBOX_PYTHON_CONSTANTS)=>vboxapi/VirtualBox_constants.py
-
-$(VBOX_PYTHON_CONSTANTS):  $(VBOX_PATH_MAIN_SRC)/glue/constants-python.xsl $(VBOX_XIDL_FILE) | $$(dir $$@)
+VBox-python-glue_INST = $(INST_SDK)installer/vboxapi/
+VBox-python-glue_MODE = a+r,u+w
+VBox-python-glue_SOURCES = \
+        glue/vboxapi.py \
+        $(VBox-python-glue_0_OUTDIR)/VirtualBox_constants.py
+VBox-python-glue_CLEAN = \
+        $(VBox-python-glue_0_OUTDIR)/VirtualBox_constants.py
+
+$$(VBox-python-glue_0_OUTDIR)/VirtualBox_constants.py:  \
+                $(VBOX_PATH_MAIN_SRC)/glue/constants-python.xsl \
+                $(VBOX_XIDL_FILE) \
+                | $$(dir $$@)
         $(call MSG_TOOL,xsltproc,Python constants,$<,$@)
         $(QUIET)$(VBOX_XSLTPROC) -o $@ $< $(VBOX_XIDL_FILE)
@@ -762 +766 @@
 INSTALLS.win += VBoxMain-com-inst
 VBoxMain-com-inst_INST = $(INST_BIN)
+VBoxMain-com-inst_MODE = a+r,u+w
 VBoxMain-com-inst_SOURCES = src-all/win/comregister.cmd
 
@@ -865 +870 @@
 
 ifdef VBOX_WITH_JMSCOM
-INSTALLS += VBoxJMscom-inst-jar
 
 #
@@ -877 +881 @@
 VBOX_JACOB_DIR     := $(PATH_ROOT)/src/libs/jacob-1.15-M3
 
+INSTALLS += VBoxJMscom-inst-jar
 VBoxJMscom-inst-jar_INST = $(INST_SDK)bindings/mscom/java/
+VBoxJMscom-inst-jar_MODE = a+r,u+w
 VBoxJMscom-inst-jar_SOURCES = \
         $(VBOX_JMSCOM_JAR)
@@ -924 +930 @@
 INSTALLS += javagluesample
 javagluesample_INST = $(INST_SDK)bindings/glue/java/
-javagluesample_MODE = a+rx,u+w
+javagluesample_MODE = a+r,u+w
 javagluesample_SOURCES = \
         $(VBOX_PATH_MAIN_SRC)/glue/tests/TestVBox.java=>TestVBox.java \
@@ -940 +946 @@
         $(call MSG_TOOL,xsltproc,Test Settings Converter,$<,$<.test)
         $(QUIET)$(VBOX_XSLTPROC) -o $<.test xml/SettingsConverter.xsl $<
+

trunk/src/VBox/Main/webservice/Makefile.kmk

@@ -312 +312 @@
 
 VBoxJWs-inst-jar_INST = $(INST_SDK)bindings/webservice/java/jax-ws/
+VBoxJWs-inst-jar_MODE = a+r,u+w
 VBoxJWs-inst-jar_SOURCES = \
         $(VBOX_JWS_JAR)