Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] PERFORCE change 76991 by David Michael Leo Brown Jr. for review

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Perforce Review Daemon <p4review AT smee.org>
  • To: "Andrew Stitt" <a AT t.armory.com>, "Arjan Bouter" <abouter AT gmail.com>, "Arwed von Merkatz" <v.merkatz AT gmx.net>, "SM-Commit Daemon" <sm-commit AT lists.ibiblio.org>, "David Michael Leo Brown Jr." <dmlb2000 AT gmail.com>, "David Kowis" <dkowis+smgl-p4 AT shlrm.org>, "duane_malcolm" <d.malcolm AT auckland.ac.nz>, "Eric Sandall" <eric AT sandall.us>, "Jason Flatt" <jflatt AT sourcemage.org>, "Jeremy Blosser" <jblosser AT sourcemage.org>, "Ladislav Hagara" <ladislav.hagara AT unob.cz>, "Maurizio Boriani" <baux AT member.fsf.org>, "Robin Cook" <rcook AT wyrms.net>, "Unet" <unet AT sourcemage.org>, "vladimir_marek" <vlmarek AT volny.cz>
  • Subject: [SM-Commit] PERFORCE change 76991 by David Michael Leo Brown Jr. for review
  • Date: Wed, 29 Mar 2006 20:15:02 +0100 (BST)

Change 76991 by david_brown@dmlb2000-dmlb2004 on 2006/03/29 20:15:00

fixed issue with carrying the error across the export so it doesn't
try to run delve on build api2

also made the stage root and destroyed the stage root for build api1
spells

Affected files ...

... //sgl/sorcery/proj/proj1/var/lib/sorcery/modules/build_api/api1#22 edit
... //sgl/sorcery/proj/proj1/var/lib/sorcery/modules/build_api/api2#32 edit

Differences ...

==== //sgl/sorcery/proj/proj1/var/lib/sorcery/modules/build_api/api1#22
(xtext) ====

@@ -124,6 +124,7 @@
invoke_build_dir
invoke_gcc2
optimize
+ prepare_stage_root
invoke_installwatch

message -n "Installing in dir: "
@@ -269,6 +270,7 @@
install_desktop_files
gather_docs
devoke_installwatch
+ destroy_stage_root
init_post_install
ldconfig
# release_saved_libraries

==== //sgl/sorcery/proj/proj1/var/lib/sorcery/modules/build_api/api2#32
(xtext) ====

@@ -50,34 +50,34 @@
local PROTECT_SORCERY=yes
local rs
(
- run_pre_build || return 1
- run_config_loc || return 2
+ run_pre_build || return 1
+ run_config_loc || return 2
(
- run_build &&
- pwd > $TMP_DIR/build.saved.pwd &&
- run_pre_install &&
- prepare_stage_root &&
- invoke_installwatch &&
+ run_build &&
+ pwd > $TMP_DIR/build.saved.pwd &&
+ run_pre_install &&
+ prepare_stage_root &&
+ invoke_installwatch &&
if [[ "$STAGED_INSTALL" != "off" ]]
then
invoke_stage_root
- fi &&
- export C_LOG=$C_LOG
- export C_FIFO=$C_FIFO
- export IW_LOG=$IW_LOG
- export VOYEUR_STDOUT=$VOYEUR_STDOUT
- export VOYEUR_STDERR=$VOYEUR_STDERR
- export S_PWD=$TMP_DIR/build.saved.pwd
- delve $SPELL INSTALL &&
- delve $SPELL POST_INSTALL || return 2
+ fi &&
+ export C_LOG=$C_LOG &&
+ export C_FIFO=$C_FIFO &&
+ export IW_LOG=$IW_LOG &&
+ export VOYEUR_STDOUT=$VOYEUR_STDOUT &&
+ export VOYEUR_STDERR=$VOYEUR_STDERR &&
+ export S_PWD=$TMP_DIR/build.saved.pwd &&
+ delve $SPELL INSTALL &&
+ delve $SPELL POST_INSTALL || return 2
if [[ "$STAGED_INSTALL" != "off" ]]
then
devoke_stage_root &&
install_staged_spell
- fi &&
- devoke_installwatch &&
- destroy_stage_root &&
- run_final || return 3
+ fi &&
+ devoke_installwatch &&
+ destroy_stage_root &&
+ run_final || return 3
) 2> >(tee -a $C_LOG 1>&2 >> $VOYEUR_STDERR) \
> >(tee -a $C_LOG >> $VOYEUR_STDOUT)
)



  • [SM-Commit] PERFORCE change 76991 by David Michael Leo Brown Jr. for review, Perforce Review Daemon, 03/29/2006

Archive powered by MHonArc 2.6.24.

Top of Page