From: Perforce Review Daemon <p4review AT smee.org>
To: "Andrew Stitt" <a AT t.armory.com>, "Arjan Bouter" <abouter AT sourcemage.org>, "SM-Commit Daemon" <sm-commit AT lists.ibiblio.org>, "David Kowis" <dkowis+smgl-p4 AT shlrm.org>, "duane_malcolm" <d.malcolm AT auckland.ac.nz>, "Eric Sandall" <eric AT sandall.us>, "Ethan Grammatikidis" <eekee AT eekee.is-a-geek.org>, "Gareth Clay" <gareth AT caffeinefuelled.co.uk>, "Jason Flatt" <jflatt AT sourcemage.org>, "Juuso Alasuutari" <iuso AT sourcemage.org>, "Ladislav Hagara" <ladislav.hagara AT unob.cz>, "Maurizio Boriani" <baux AT member.fsf.org>, "Pieter Lenaerts" <e-type AT sourcemage.org>, "Pol Vinogradov" <vin.public AT gmail.com>, "Robin Cook" <rcook AT wyrms.net>, "Seth Woolley" <seth AT swoolley.homeip.net>, "Unet" <unet AT sourcemage.org>, "vladimir_marek" <vlmarek AT volny.cz>
Subject: [SM-Commit] PERFORCE change 77768 by Maurizio Boriani for review
Date: Fri, 14 Apr 2006 11:25:01 +0100 (BST)
Change 77768 by maurizio_boriani@baux-elisya on 2006/04/14 11:23:54
@@ -7,8 +7,8 @@
then
. /etc/profile.d/GNUstep.sh
else
- message "${ERROR_COLOR}Unable to find /etc/profile.d/GNUstep.sh"
- message "Rebuild gnustep-make${DEFAULT_COLOR}"
+ message "${ERROR_COLOR}Unable to find /etc/profile.d/GNUstep.sh" &&
+ message "Rebuild gnustep-make${DEFAULT_COLOR}" &&
return 1
fi &&
@@ -26,10 +26,8 @@
make &&
cd ../
fi
- return 0
}
-
#
------------------------------------------------------------------------------
## Replace sorcerys default_install with a custom one
#
------------------------------------------------------------------------------
@@ -44,5 +42,4 @@
make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install &&
cd ../
fi
- return 0
}
-# A bug in gworkspace installer, missing some include files
-#if [ "$ADVCF" == "y" ];
-#then
-# cd Goodies/VCFViewer &&
-# make &&
-# make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install &&
-# cd ../../
-#fi
-
if [ "$ADSRV" == "y" ];
then
cd Goodies/adserver &&
make &&
make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install &&
cd ../../
-fi
+fi &&
if [ "$ADTOL" == "y" ];
@@ -27,6 +18,6 @@
make &&
make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install &&
cd ../../
-fi
+fi &&
@@ -1,3 +1,6 @@
+2006-04-14 Maurizio Boriani <baux AT sourcemage.org>
+ * Fix dummy concatenation bugs and others.
+
2006-04-01 Maurizio Boriani <baux AT sourcemage.org>
* DETAILS: Bump up to release 0.9.5.
* DEPENDS: Add depends for new features support.
@@ -7,8 +7,8 @@
then
. /etc/profile.d/GNUstep.sh
else
- message "${ERROR_COLOR}Unable to find /etc/profile.d/GNUstep.sh"
- message "Rebuild gnustep-make${DEFAULT_COLOR}"
+ message "${ERROR_COLOR}Unable to find /etc/profile.d/GNUstep.sh" &&
+ message "Rebuild gnustep-make${DEFAULT_COLOR}" &&
return 1
fi &&
@@ -26,16 +26,14 @@
make &&
cd ../
fi
- return 0
}
-
#
------------------------------------------------------------------------------
## Replace sorcerys default_install with a custom one
#
------------------------------------------------------------------------------
function default_install ()
{
- make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install &&
+ make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install &&
if [ "$GNUSTEP_BUILD_DOC" == "y" ]
then
@@ -44,5 +42,4 @@
make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install &&
cd ../
fi
- return 0
}
@@ -1,1 +1,1 @@
-config_query GNUSTEP_BUILD_DOC "Build and install documentation?" n
+config_query GNUSTEP_BUILD_DOC "Build and install documentation?" n
@@ -3,6 +3,6 @@
if [ "$GS_USE_APACHE" == "y" ]
then
cd $SOURCE_DIRECTORY/GSWAdaptors/Apache &&
- make install
+ make install &&
cd $SOURCE_DIRECTORY
-fi+fi
@@ -1,1 +1,1 @@
-config_query GNUSTEP_BUILD_DOC "Build and install documentation?" n
+config_query GNUSTEP_BUILD_DOC "Build and install documentation?" n
@@ -1,12 +1,14 @@
if [ -z $(installed_version gnustep-base) ];
then
- return
-fi
+ return 0
+fi &&
if [ -d /usr/GNUstep ];
then
- message "${WARNING_COLOR} Found stuff in /urs/GNUstep!"
- message "GNUstep stuff must be moved to /opt/GNUstep to be FSHS
compliant."
- message "Going to recast gnustep base and dependants
too.${DEFAULT_COLOR}"
+ message "${WARNING_COLOR} Found stuff in /urs/GNUstep!" &&
+ message "GNUstep stuff must be moved to /opt/GNUstep to be FSHS " &&
+ message "compliant." &&
+ message "Going to recast gnustep base and dependants too." &&
+ message "${DEFAULT_COLOR}" &&
up_trigger gnustep-base
fi
@@ -4,19 +4,17 @@
then
. /etc/profile.d/GNUstep.sh
else
- message "${ERROR_COLOR}Unable to find /etc/profile.d/GNUstep.sh"
- message "Rebuild gnustep-make${DEFAULT_COLOR}"
+ message "${ERROR_COLOR}Unable to find /etc/profile.d/GNUstep.sh" &&
+ message "Rebuild gnustep-make${DEFAULT_COLOR}" &&
return 1
fi &&
make_single
if [ "$APPK" == "n" ];
then
- message "Building StepTalk without AppKit extensions${DEFAULT_COLOR}"
+ message "Building StepTalk without AppKit extensions${DEFAULT_COLOR}" &&
make appkit=no
else
make
-fi
+fi &&
make_normal
-
-return 0