Changeset 55347 in vbox

Timestamp:

Apr 21, 2015 9:35:17 AM (10 years ago)

Author:

vboxsync

Message:

configure: introduced --only-additions

File:

• trunk/configure (modified) (12 diffs)

trunk/configure

@@ -72 +72 @@
 OUT_PATH_OVERRIDE=0
 SETUP_WINE=
+ONLY_ADDITIONS=0
 TARGET_MACHINE=""
 TARGET_CPU=""
@@ -2297 +2298 @@
 [ "$OS"   != "darwin" ] && echo "  --setup-wine             setup a Wine directory and register the hhc hack"
 cat << EOF
+  --only-additions         only build the Guest Additions
 
 Paths:
@@ -2564 +2566 @@
       [ "$OS" != "darwin" ] && SETUP_WINE=1
       ;;
+    --only-additions)
+      ONLY_ADDITIONS=1
+      ;;
     *)
       echo
@@ -2657 +2662 @@
 
 # extpack
-if [ $OSE -eq 0 ]; then
+if [ $ONLY_ADDITIONS -eq 1 ]; then
+  cnf_append "VBOX_WITH_EXTPACK_PUEL_BUILD" ""
+elif [ $OSE -eq 0 ]; then
   if [ $WITH_EXTPACK -eq 1 ]; then
     BUILD_LIBSSL=1
@@ -2693 +2700 @@
 # the tools
 check_gcc
-check_open_watcom
-[ "$OS" != "darwin"  ] && check_iasl
-# don't check for yasm for the time beeing as 0.40 and 0.50 both have known bugs
-# [ "$OS" != "darwin" ] && check_yasm
-[ "$OS" != "darwin"  ] && check_xsltproc
-[ "$OS" != "darwin"  ] && check_mkisofs
+if [ $ONLY_ADDITIONS -eq 0 ]; then
+  check_open_watcom
+  [ "$OS" != "darwin"  ] && check_iasl
+  # don't check for yasm for the time beeing as 0.40 and 0.50 both have known bugs
+  # [ "$OS" != "darwin" ] && check_yasm
+  [ "$OS" != "darwin"  ] && check_xsltproc
+  [ "$OS" != "darwin"  ] && check_mkisofs
+fi
 
 # the libraries
-[ "$OS" != "darwin"  ] && check_pthread
-check_libxml2
-[ $WITH_LIBIDL -eq 1 ] && check_libidl
-check_ssl
-check_curl
-[ $WITH_LIBVPX -eq 1 ] && check_vpx
-[ "$OS" != "darwin"  ] && check_z
-[ "$OS" != "darwin"  ] && check_png
-[ $OSE -eq 0 -a "$OS" = "linux" ] && check_pam
-[ $WITH_SDL -eq 1 ]    && check_sdl
-[ $WITH_SDL_TTF -eq 1 -a $OSE -eq 0 ] && check_sdl_ttf
-[ $WITH_X11    -eq 1 ] && check_x
-# TODO check for xcomposite-dev (X11/extensions/Xcomposite.h, additions only)
-# TODO check for libxdamange-dev (X11/extensions/Xdamage.h, additions only)
-[ $WITH_X11    -eq 1 ] && check_xcursor
-[ $WITH_X11    -eq 1 ] && check_xinerama
-[ $WITH_X11    -eq 1 ] && check_xrandr
-[ $WITH_OPENGL -eq 1 ] && check_opengl
-[ $WITH_QT4    -eq 1 ] && check_qt4
-[ $WITH_PYTHON -eq 1 ] && check_python
-[ $WITH_JAVA   -eq 1 ] && check_java
-
-# PulseAudio
-if [ "$OS" = "linux" -o "$OS" = "freebsd" ]; then
-  if [ $WITH_PULSE -eq 1 ]; then
-    check_pulse
-  elif [ $WITH_PULSE -eq 0 ]; then
-    cnf_append "VBOX_WITH_PULSE" ""
-  fi
+if [ $ONLY_ADDITIONS -eq 0 ]; then
+  [ "$OS" != "darwin"  ] && check_pthread
+  check_libxml2
+  [ $WITH_LIBIDL -eq 1 ] && check_libidl
+  check_ssl
+  check_curl
+  [ $WITH_LIBVPX -eq 1 ] && check_vpx
+ [ "$OS" != "darwin"  ] && check_z
+  [ "$OS" != "darwin"  ] && check_png
+  [ $OSE -eq 0 -a "$OS" = "linux" ] && check_pam
+  [ $WITH_SDL -eq 1 ]    && check_sdl
+  [ $WITH_SDL_TTF -eq 1 -a $OSE -eq 0 ] && check_sdl_ttf
+  [ $WITH_X11    -eq 1 ] && check_x
+  # TODO check for xcomposite-dev (X11/extensions/Xcomposite.h, additions only)
+  # TODO check for libxdamange-dev (X11/extensions/Xdamage.h, additions only)
+  [ $WITH_X11    -eq 1 ] && check_xcursor
+  [ $WITH_X11    -eq 1 ] && check_xinerama
+  [ $WITH_X11    -eq 1 ] && check_xrandr
+  [ $WITH_OPENGL -eq 1 ] && check_opengl
+  [ $WITH_QT4    -eq 1 ] && check_qt4
+  [ $WITH_PYTHON -eq 1 ] && check_python
+  [ $WITH_JAVA   -eq 1 ] && check_java
+
+  # PulseAudio
+  if [ "$OS" = "linux" -o "$OS" = "freebsd" ]; then
+    if [ $WITH_PULSE -eq 1 ]; then
+      check_pulse
+    elif [ $WITH_PULSE -eq 0 ]; then
+      cnf_append "VBOX_WITH_PULSE" ""
+    fi
+ fi
 fi
 
@@ -2744 +2755 @@
     cnf_append "VBOX_WITH_ADDITION_DRIVERS" ""
   fi
-  if [ $WITH_ALSA -eq 1 ]; then
-    check_alsa
-  else
-    cnf_append "VBOX_WITH_ALSA" ""
-  fi
-  if [ $WITH_DBUS -eq 0 ]; then
-    cnf_append "VBOX_WITH_DBUS" ""
-  fi
-  if [ $WITH_DEVMAPPER -eq 1 ]; then
-    check_libdevmapper
-  else
-    cnf_append "VBOX_WITH_DEVMAPPER" ""
-  fi
-  check_libcap
+  if [ $ONLY_ADDITIONS -eq 0 ]; then
+    if [ $WITH_ALSA -eq 1 ]; then
+      check_alsa
+    else
+      cnf_append "VBOX_WITH_ALSA" ""
+    fi
+    if [ $WITH_DBUS -eq 0 ]; then
+      cnf_append "VBOX_WITH_DBUS" ""
+    fi
+    if [ $WITH_DEVMAPPER -eq 1 ]; then
+      check_libdevmapper
+    else
+      cnf_append "VBOX_WITH_DEVMAPPER" ""
+    fi
+    check_libcap
+  fi
   check_compiler_h
-  [ "$BUILD_MACHINE" = "amd64" -a $WITH_VMMRAW -eq 1 ] && check_32bit
+  [ $ONLY_ADDITIONS -eq 0 -a "$BUILD_MACHINE" = "amd64" -a $WITH_VMMRAW -eq 1 ] && check_32bit
   # tools/common/makeself*
   [ $OSE -ge 1 ] && check_makeself
@@ -2766 +2779 @@
 [ -n "$SETUP_WINE" ] && setup_wine
 
-if [ $WITH_GSOAP -eq 1 ]; then
+if [ $ONLY_ADDITIONS -eq 0 -a $WITH_GSOAP -eq 1 ]; then
   check_gsoap
 else
@@ -2775 +2788 @@
 
 # UDPTUNNEL
-if [ $WITH_UDPTUNNEL -eq 0 ]; then
+if [ $ONLY_ADDITIONS -eq 0 -a $WITH_UDPTUNNEL -eq 0 ]; then
   cnf_append "VBOX_WITH_UDPTUNNEL" ""
 fi
 
 # VDE
-if [ "$OS" = "linux" -o "$OS" = "freebsd" ]; then
+if [ $ONLY_ADDITIONS -eq 0 -a "$OS" = "linux" -o "$OS" = "freebsd" ]; then
   if [ $WITH_VDE -eq 1 ]; then
     cnf_append "VBOX_WITH_VDE" "1"
@@ -2787 +2800 @@
 
 # DOCS
-if [ $WITH_DOCS -eq 0 ]; then
+if [ $ONLY_ADDITIONS -eq 1 -o $WITH_DOCS -eq 0 ]; then
   cnf_append "VBOX_WITH_DOCS" ""
   cnf_append "VBOX_WITH_DOCS_PACKING" ""
@@ -2793 +2806 @@
 
 # VNC server support
-if [ $OSE -ge 1 ]; then
+if [ $ONLY_ADDITIONS -eq 0 -a $OSE -ge 1 ]; then
   if [ $WITH_VNC = 1 ]; then
     check_vncserver
@@ -2799 +2812 @@
     cnf_append "VBOX_WITH_EXTPACK_VNC" ""
   fi
+fi
+
+if [ $ONLY_ADDITIONS -eq 1 ]; then
+  cnf_append "VBOX_ONLY_ADDITIONS" "1"
 fi
 
@@ -2821 +2838 @@
     echo ""
 fi
-if [ $WITH_HARDENING -gt 0 ]; then
+if [ $ONLY_ADDITIONS -eq 1 ]; then
+    echo ""
+    echo "  Tree configured to build only the Guest Additions"
+    echo ""
+elif [ $WITH_HARDENING -gt 0 ]; then
     echo ""
     echo "  +++ WARNING +++ WARNING +++ WARNING +++ WARNING +++ WARNING +++ WARNING +++"