Changeset 11588 in vbox

Timestamp:

Aug 22, 2008 10:05:59 PM (17 years ago)

Author:

vboxsync

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

35210

Message:

python: cleanup.

File:

• trunk/src/libs/xpcom18a4/Makefile.kmk (modified) (2 diffs)

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -1317 +1317 @@
    endif
  endif
- DLLS +=VBox-xpcom-pymod
-endif
-
-# Python Client Module.
-PY_PATH = sdk/bindings/com/python/xpcom
-PY_DEST = $(PATH_BIN)/$(PY_PATH)
-PY_SAMPLE = $(PATH_BIN)/sdk/bindings/com/python/sample
-
-VBox-xpcom-pymod_TEMPLATE = XPCOM
-## @todo why isn't this target called VBoxPython?
-VBox-xpcom-pymod_NAME = VBoxPython
-VBox-xpcom-pymod_DEFS = _IMPL_NS_COM _IMPL_NS_BASE EXPORT_XPTI_API EXPORT_XPT_API VBOX_PYXPCOM
-VBox-xpcom-pymod_INCS += $(VBOX_PATH_PYTHON_INC) python/src
-VBox-xpcom-pymod_SOURCES = \
+ DLLS += VBoxPython
+ INSTALLS += VBoxPython-inst-py-xpcom
+ INSTALLS += VBoxPython-inst-sample
+endif
+
+# Python Client Module - the C++/XPCOM bits.
+VBoxPython_TEMPLATE = XPCOM
+VBoxPython_DEFS = _IMPL_NS_COM _IMPL_NS_BASE EXPORT_XPTI_API EXPORT_XPT_API VBOX_PYXPCOM
+VBoxPython_INCS = \
+        $(VBOX_PATH_PYTHON_INC) \
+        python/src
+VBoxPython_SOURCES = \
         python/src/module/_xpcom.cpp \
         python/src/dllmain.cpp \
@@ -1353 +1351 @@
         python/src/TypeObject.cpp \
         python/src/VariantUtils.cpp
-VBox-xpcom-pymod_LIBS = $(PATH_BIN)/VBoxXPCOM$(VBOX_SUFF_DLL)
-## @todo rewrite this to an INSTALLS target, it's just copying.
-VBox-xpcom-pymod_DEPS = \
-        $(PY_DEST)/components.py \
-        $(PY_DEST)/file.py \
-        $(PY_DEST)/__init__.py \
-        $(PY_DEST)/nsError.py \
-        $(PY_DEST)/primitives.py \
-        $(PY_DEST)/xpcom_consts.py \
-        $(PY_DEST)/xpt.py \
-        $(PY_DEST)/client/__init__.py \
-        $(PY_DEST)/server/__init__.py \
-        $(PY_DEST)/server/enumerator.py \
-        $(PY_DEST)/server/factory.py \
-        $(PY_DEST)/server/loader.py \
-        $(PY_DEST)/server/module.py \
-        $(PY_DEST)/server/policy.py \
-        $(PY_SAMPLE)/vboxshell.py \
-        $(TARGET_VBoxXPCOM)
-
-$(PY_DEST):
-        $(QUIET)$(MKDIR) -p -- \
-                $@ \
-                $(PY_SAMPLE) \
-                $@/client \
-                $@/server
-
-$(PY_DEST)/%.py: $(PATH_SUB_CURRENT)/python/%.py $(PY_DEST)
-        $(QUIET)$(CP) -f -- $< $@
-
-$(PY_SAMPLE)/%.py: $(PATH_SUB_CURRENT)/python/sample/%.py $(PY_DEST)
-        $(QUIET)$(CP) -f -- $< $@
+VBoxPython_LIBS = $(PATH_BIN)/VBoxXPCOM$(VBOX_SUFF_DLL)
+
+# Python Client Module - the Python bits.
+VBoxPython-inst-py-xpcom_INST = $(INST_SDK)/bindings/com/python/xpcom/
+VBoxPython-inst-py-xpcom_SOURCES = \
+        python/components.py \
+        python/file.py \
+        python/__init__.py \
+        python/nsError.py \
+        python/primitives.py \
+        python/xpcom_consts.py \
+        python/xpt.py \
+        python/client/__init__.py=>client/__init__.py \
+        python/server/__init__.py=>server/__init__.py \
+        python/server/enumerator.py=>server/enumerator.py \
+        python/server/factory.py=>server/factory.py \
+        python/server/loader.py=>server/loader.py \
+        python/server/module.py=>server/module.py \
+        python/server/policy.py=>server/policy.py
+
+# Python Client Module - a sample script.
+VBoxPython-inst-sample_INST = $(INST_SDK)/bindings/com/python/sample/
+VBoxPython-inst-sample_SOURCES = \
+        python/sample/vboxshell.py