sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
Re: [SM-Commit] GIT changes to master grimoire by Andraž Levstik (8f45882dc4e2f0fe6e71e2fa6b5926daf6af6177)
- From: Jaka Kranjc <lynx AT mages.ath.cx>
- To: sm-commit AT lists.ibiblio.org
- Subject: Re: [SM-Commit] GIT changes to master grimoire by Andraž Levstik (8f45882dc4e2f0fe6e71e2fa6b5926daf6af6177)
- Date: Fri, 20 Apr 2007 22:42:49 +0200
first of all - thanks for giving this long forgotten section some attention!
On Friday 20 of April 2007 22:07:37 Andraž Levstik wrote:
> +++ b/gnustep-apps/FUNCTIONS
> @@ -1,45 +1,25 @@
> -#
> ---------------------------------------------------------------------------
>--- +#---
> ## Replace sorcerys default_build with a custom one
> -#
> ---------------------------------------------------------------------------
>--- -function default_build ()
> +#---
> +function default_build()
> {
> - if [ -f /etc/profile.d/GNUstep.sh ]
> - then
> - . /etc/profile.d/GNUstep.sh
> - else
> - message "${ERROR_COLOR}Unable to find /etc/profile.d/GNUstep.sh" &&
> - message "Rebuild gnustep-make${DEFAULT_COLOR}" &&
> - return 1
> - fi
> && -
> - if [ -f ./configure ]
> - then
> - ./configure \
> - $OPTS
> - fi
> && -
> - make
> && -
> - if [ "$GNUSTEP_BUILD_DOC" == "y" ]
> - then
> - cd Documentation &&
> - make &&
> - cd ../
> - fi
> + if [[ -f ${TRACK_ROOT}/usr/share/GNUstep/Makefiles/GNUstep.sh ]]
> + then
> + . ${TRACK_ROOT}/usr/share/GNUstep/Makefiles/GNUstep.sh
> + fi
Are you sure this ${TRACK_ROOT} usage is correct? It looks like it should be
INSTALL_ROOT to me.
Also, the last fi needs && or the function isn't chained properly.
> + if [[ -x ./configure ]]
> + then
> + real_default_build
> + else
> + make $@
> + fi
> }
I noticed the previous function had some special doc handling - is that
redundant now? I didn't see any spell changes to that effect (from the few I
checked), but perhaps it is just some even older bitrot.
> -#
> ---------------------------------------------------------------------------
>--- -## Replace sorcerys default_install with a custom one
> -#
> ---------------------------------------------------------------------------
>--- -function default_install ()
> +function default_post_install()
> {
> - make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install
> && -
> - if [ "$GNUSTEP_BUILD_DOC" == "y" ]
> - then
> - cd Documentation
> && - make
> && - make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install
> && - cd ../
> - fi
> + real_default_post_install
> + if [[ -x /usr/bin/make_services ]]; then
> + message "Running make_services"
> + /usr/bin/make_services
> + fi
> }
These two /usr/bin/ma* could use some INSTALL_ROOT too.
Also, real_default_post_install needs && or the function wouldn't fail as it
should sometimes.
> +++ b/ChangeLog
> @@ -1,3 +1,8 @@
> +2007-04-20 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
> + * gnustep-apps/FUNCTIONS: fixups
> + * gnustep-libs/FUNCTIONS: fixups
Please be more verbose next time, "fixups" doesn't relay much (if anything).
--
We cannot command nature except by obeying her. --Sir Francis Bacon
Have a sourcerous day! www.sourcemage.org
Attachment:
pgptSp7LwVgQg.pgp
Description: PGP signature
-
[SM-Commit] GIT changes to master grimoire by Andraž Levstik (8f45882dc4e2f0fe6e71e2fa6b5926daf6af6177),
Andraž Levstik, 04/20/2007
-
Re: [SM-Commit] GIT changes to master grimoire by Andraž Levstik (8f45882dc4e2f0fe6e71e2fa6b5926daf6af6177),
Jaka Kranjc, 04/20/2007
-
Re: [SM-Commit] GIT changes to master grimoire by Andra ž Levstik (8f45882dc4e2f0fe6e71e2fa6b5926daf6af61 77),
Andraž 'ruskie' Levstik, 04/20/2007
-
Re: [SM-Commit] GIT changes to master grimoire by Andra ž Levstik (8f45882dc4e2f0fe6e71e2fa6b5926daf6af61 77),
Jaka Kranjc, 04/20/2007
- Re: [SM-Commit] GIT changes to master grimoire by Andra ž Levstik (8f45882dc4e2f0fe6e71e2fa6b5926daf6af61 77), Andraž 'ruskie' Levstik, 04/20/2007
-
Re: [SM-Commit] GIT changes to master grimoire by Andra ž Levstik (8f45882dc4e2f0fe6e71e2fa6b5926daf6af61 77),
Jaka Kranjc, 04/20/2007
-
Re: [SM-Commit] GIT changes to master grimoire by Andra ž Levstik (8f45882dc4e2f0fe6e71e2fa6b5926daf6af61 77),
Andraž 'ruskie' Levstik, 04/20/2007
-
Re: [SM-Commit] GIT changes to master grimoire by Andraž Levstik (8f45882dc4e2f0fe6e71e2fa6b5926daf6af6177),
Jaka Kranjc, 04/20/2007
Archive powered by MHonArc 2.6.24.