Changeset 11848 in vbox for trunk/src

Timestamp:

Aug 29, 2008 8:31:36 PM (16 years ago)

Author:

vboxsync

Message:

docs, other sdk cleanups

Location:

trunk/src

Files:

• VBox/Installer/linux/Makefile.kmk (modified) (2 diffs)
• VBox/Main/Doxyfile.Main (modified) (2 diffs)
• VBox/Main/Makefile.kmk (modified) (3 diffs)
• VBox/Main/testcase/Makefile.kmk (modified) (1 diff)
• libs/Makefile.kmk (modified) (4 diffs)
• libs/xpcom18a4/python/sample/vboxshell.py (modified) (1 diff)

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

@@ -153 +153 @@
         VirtualBox.chm
  endif
- ifneq ($(wildcard $(PATH_BIN)/VirtualBoxAPI.chm),)
+ ifneq ($(wildcard $(VBOX_PATH_SDK)/docs/VirtualBoxAPI.chm),)
  # same applies to VirtualBoxAPI.chm
  LINUXNOSTRIP += \
@@ -262 +262 @@
                 $(VBOX_VERSION_STAMP)
         $(call MSG_L1,Making SDK delivery $@)
-        $(QUIET)$(REDIRECT) -C $(PATH_BIN) -- zip -r9 $@ sdk
+        $(QUIET)$(REDIRECT) -C $(PATH_BIN) -- zip -r9 $@ sdk > /dev/null
 endif
 

trunk/src/VBox/Main/Doxyfile.Main

@@ -31 +31 @@
 # where doxygen was started. If left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = $(PATH_OUT)/docs/Main
+OUTPUT_DIRECTORY       = $(DOCDIR)
 
 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
@@ -406 +406 @@
 # to stderr.
 
-WARN_LOGFILE           = $(PATH_OUT)/docs/Main.err
+WARN_LOGFILE           = $(PATH_TARGET)/Main.err
 
 #---------------------------------------------------------------------------

trunk/src/VBox/Main/Makefile.kmk

@@ -140 +140 @@
 docs: $(PATH_TARGET)/docs.Main
 
+DOCDIR = $(VBOX_PATH_SDK)/docs/
+
 $(PATH_TARGET)/docs.Main: \
                 $(VBOX_PATH_MAIN_SRC)/Doxyfile.Main \
@@ -145 +147 @@
                 $(VBOX_PATH_MAIN_SRC)/idl/VirtualBox.xidl \
                 | $(call DIRDEP, $(PATH_TARGET)) \
-                  $(call DIRDEP, $(PATH_OUT)/docs/Main)
-        $(RM) -f $(wildcard $(PATH_OUT)/docs/Main/html/*)
+                  $(call DIRDEP, $(DOCDIR))
+        $(RM) -f $(wildcard $(DOCDIR)/html/*)
         $(VBOX_XSLTPROC) -o $(PATH_TARGET)/VirtualBox.idl $(VBOX_PATH_MAIN_SRC)/idl/doxygen.xsl $(VBOX_PATH_MAIN_SRC)/idl/VirtualBox.xidl
-        $(REDIRECT) -E 'PATH_OUT=$(PATH_OUT)' -E 'PATH_TARGET=$(PATH_TARGET)' -E 'PATH_CHM=$(subst /,\,$(PATH_BIN)/VirtualBoxAPI.chm)' \
+        $(REDIRECT) -E 'DOCDIR=$(DOCDIR)' -E 'PATH_TARGET=$(PATH_TARGET)' -E 'PATH_CHM=$(subst /,\,$(DOCDIR)/VirtualBoxAPI.chm)' \
                 -- doxygen $(VBOX_PATH_MAIN_SRC)/Doxyfile.Main
-        -$(EXEC_X86_WIN32) $(VBOX_PATH_HTML_HELP_WORKSHOP)/hhc.exe $(subst /,\\,$(PATH_OUT)/docs/Main/html/index.hhp)
+        -$(EXEC_X86_WIN32) $(VBOX_PATH_HTML_HELP_WORKSHOP)/hhc.exe $(subst /,\\,$(DOCDIR)/html/index.hhp)
         $(APPEND) $(PATH_TARGET)/docs.Main
 
-$(call DIRDEP, $(PATH_OUT)/docs/Main):
+$(call DIRDEP, $(DOCDIR)):
         $(MKDIR) -p $@
 
@@ -659 +661 @@
 else
 
-testidl: $(IDLFILE) $(IDLFILE.MSCOM) $(PATH_VBoxCOM)/VirtualBox_i.c
+testidl: $(IDLFILE.MSCOM) $(PATH_VBoxCOM)/VirtualBox_i.c
 
 endif

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

@@ -59 +59 @@
  samples_INST = $(INST_SDK)bindings/xpcom/samples/
  samples_SOURCES = tstVBoxAPILinux.cpp makefile.tstVBoxAPILinux=>Makefile
- ifdef VBOX_WITH_TESTCASES
- samples_SYMLINKS = tstVBoxAPILinux=>../../../tstVBoxAPILinux
- endif
 endif
 

trunk/src/libs/Makefile.kmk

@@ -57 +57 @@
 endif # !VBOX_ONLY_DOCS
 
+
 # Main related things - XML and XSLT, XPCOM.
 ifndef VBOX_ONLY_DOCS
@@ -88 +89 @@
 include $(KBUILD_PATH)/header.kmk
 
+subdirs := liblzf-1.51 $(subdirs.$(KBUILD_TARGET))
 
-subdirs := liblzf-1.51 $(subdirs.$(KBUILD_TARGET))
 ifdef IPRT_WITH_KSTUFF
  subdirs += kStuff
@@ -97 +98 @@
 #ifndef VBOX_OSE
  ifeq ($(SDK_VBOX_ZLIB_INCS),$(PATH_ROOT)/src/libs/zlib-1.2.1)
-  subdirs += zlib-1.2.1
+   subdirs += zlib-1.2.1
  endif
  ifeq ($(SDK_VBOX_LIBPNG_INCS),$(PATH_ROOT)/src/libs/libpng-1.2.8)
@@ -140 +141 @@
 endif
 
+ifdef VBOX_ONLY_SDK
+ subdirs := $(filter-out liblzf-1.51 zlib-1.2.1 libpng-1.2.8 openssl-0.9.7e openssl-0.9.8h ffmpeg-20060710, $(subdirs))
+endif
+
 # optimized walking
 SUBDIRS_BLDPROGS       = $(filter xpcom18a4,$(subdirs))

trunk/src/libs/xpcom18a4/python/sample/vboxshell.py

@@ -5 +5 @@
 # information and issue commands from a simple command line.                    #
 #                                                                               #
-# It also provides you with examples on how to use VirtualBox' Python API.      #
+# It also provides you with examples on how to use VirtualBox's Python API.     #
 # This shell is even somewhat documented and supports TAB-completion and        #
 # history if you have Python readline installed.                                #