Added new gnustep-config option --installation-domain=xxx to print the default installation domain for a certain package as configured in the installation-domains.conf file

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@27412 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2008-12-24 17:05:18 +00:00
parent 5c01cb3550
commit 8cd003b26a
3 changed files with 23 additions and 6 deletions

View file

@ -1,3 +1,8 @@
2008-12-24 Nicola Pero <nicola.pero@meta-innovation.com>
* gnustep-config.in: Added new --installation-domain-for=xxx option.
* rules.make (print-gnustep-make-installation-domain): New target.
2008-12-21 Adam Fedor <fedor@gnu.org>
* Version 2.0.7

View file

@ -37,6 +37,7 @@ case "$1" in
--objc-libs) ;;
--base-libs) ;;
--gui-libs) ;;
--installation-domain-for=*) ;;
*)
# An unrecognized option
echo "Unrecognized option: $1"
@ -86,6 +87,10 @@ if [ "$1" = "--help" ]; then
echo
echo "--gui-libs: prints all the flags required to link a GUI ObjC program"
echo
echo "--installation-domain-for=xxx: prints the value of the default installation domain"
echo " for the package xxx. The result could be 'SYSTEM', 'NETWORK', 'LOCAL'"
echo " or 'USER'. This command always returns LOCAL unless the system has been"
echo " personalized using an installation-domains.conf file."
exit 0
fi
@ -146,15 +151,18 @@ export GNUSTEP_MAKEFILES
#
case "$1" in
--variable=GNUSTEP_MAKEFILES) echo "$GNUSTEP_MAKEFILES"
exit 0;;
exit 0;;
--objc-flags) @GNUMAKE@ -f "$GNUSTEP_MAKEFILES/empty.make" print-gnustep-make-objc-flags quiet=yes 2>/dev/null
exit 0;;
exit 0;;
--objc-libs) @GNUMAKE@ -f "$GNUSTEP_MAKEFILES/empty.make" print-gnustep-make-objc-libs quiet=yes 2>/dev/null
exit 0;;
exit 0;;
--base-libs) @GNUMAKE@ -f "$GNUSTEP_MAKEFILES/empty.make" print-gnustep-make-base-libs quiet=yes 2>/dev/null
exit 0;;
exit 0;;
--gui-libs) @GNUMAKE@ -f "$GNUSTEP_MAKEFILES/empty.make" print-gnustep-make-gui-libs quiet=yes 2>/dev/null
exit 0;;
exit 0;;
--installation-domain-for=*) gs_package_name=`echo "$1" | sed -e 's/--installation-domain-for=//'`
@GNUMAKE@ -f "$GNUSTEP_MAKEFILES/empty.make" print-gnustep-make-installation-domain PACKAGE_NAME="$gs_package_name" quiet=yes 2>/dev/null
exit 0;;
esac
#

View file

@ -658,7 +658,8 @@ $(GNUSTEP_OBJ_DIR):
print-gnustep-make-objc-flags \
print-gnustep-make-objc-libs \
print-gnustep-make-base-libs \
print-gnustep-make-gui-libs
print-gnustep-make-gui-libs \
print-gnustep-make-installation-domain
# Print GNUstep make help. The sed command is used to strip all lines
# beginning with '#' from the file. It will find all lines that match
@ -687,5 +688,8 @@ print-gnustep-make-base-libs:
print-gnustep-make-gui-libs:
@(echo $(ALL_LDFLAGS) $(CC_LDFLAGS) $(ALL_LIB_DIRS) $(ADDITIONAL_GUI_LIBS) $(AUXILIARY_GUI_LIBS) $(GUI_LIBS) $(BACKEND_LIBS) $(ADDITIONAL_TOOL_LIBS) $(AUXILIARY_TOOL_LIBS) $(FND_LIBS) $(ADDITIONAL_OBJC_LIBS) $(AUXILIARY_OBJC_LIBS) $(OBJC_LIBS) $(SYSTEM_LIBS) $(TARGET_SYSTEM_LIBS))
print-gnustep-make-installation-domain:
@(echo $(GNUSTEP_INSTALLATION_DOMAIN))
endif
# rules.make loaded