Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] PERFORCE change 78360 by Juuso Alasuutari 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 sourcemage.org>, "SM-Commit Daemon" <sm-commit AT lists.ibiblio.org>, "duane_malcolm" <d.malcolm AT auckland.ac.nz>, "George J. Sherwood" <george AT beernabeer.com>, "Ladislav Hagara" <ladislav.hagara AT unob.cz>, "Maurizio Boriani" <baux AT member.fsf.org>, "Pieter Lenaerts" <e-type AT sourcemage.org>, "Robin Cook" <rcook AT wyrms.net>, "Seth Woolley" <seth AT swoolley.homeip.net>, "vladimir_marek" <vlmarek AT volny.cz>
  • Subject: [SM-Commit] PERFORCE change 78360 by Juuso Alasuutari for review
  • Date: Tue, 25 Apr 2006 04:05:01 +0100 (BST)

Change 78360 by juuso_alasuutari@juuso_alasuutari-kamayuq on 2006/04/25
04:02:57

Updated to correct version 1.0-8756, sanitized code.

Affected files ...

... //sgl/grimoires/z-rejected/z-kernels/nvidia_headers/DETAILS#7 edit
... //sgl/grimoires/z-rejected/z-kernels/nvidia_headers/HISTORY#14 edit
... //sgl/grimoires/z-rejected/z-kernels/nvidia_headers/INSTALL#5 edit
... //sgl/grimoires/z-rejected/z-kernels/nvidia_headers/POST_REMOVE#4 edit
... //sgl/grimoires/z-rejected/z-kernels/nvidia_headers/PREPARE#2 edit
... //sgl/grimoires/z-rejected/z-kernels/nvidia_headers/PRE_BUILD#5 edit

Differences ...

==== //sgl/grimoires/z-rejected/z-kernels/nvidia_headers/DETAILS#7 (xtext)
====

@@ -1,13 +1,13 @@
SPELL=nvidia_headers
- VERSION=1.0-7664-pkg1
+ VERSION=1.0-8756
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- WEB_SITE=http://www.nvidia.com
+ WEB_SITE=http://www.nvidia.com/object/unix.html
ENTERED=20030528
UPDATED=20040226
ARCHIVE=off
- LICENSE[0]=http://www.nvidia.com/view.asp?IO=nv_swlicense
+ LICENSE[0]=http://www.nvidia.com/object/nv_swlicense.html
SHORT="Header files provided by NVIDIA"
cat << EOF
NVIDIA
-These are the header files provided by NVIDIA to compile GL applications for
NVIDIA GPUs
+These are the header files provided by NVIDIA to compile GL applications for
NVIDIA GPUs.
EOF

==== //sgl/grimoires/z-rejected/z-kernels/nvidia_headers/HISTORY#14 (text)
====

@@ -1,3 +1,10 @@
+2006-04-25 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DETAILS: Updated to 1.0-8756, updated WEB_SITE and LICENSE.
+ * INSTALL: Made all variables local, sanitized code
+ * POST_REMOVE: Made vars local, sanitized
+ * PRE_BUILD: Same here...
+ * PREPARE: ...and here
+
2006-04-23 David Brown <dmlb2000 AT gmail.com>
* PRE_BUILD: added mk_source_dir so delve will work


==== //sgl/grimoires/z-rejected/z-kernels/nvidia_headers/INSTALL#5 (xtext)
====

@@ -1,5 +1,8 @@
-GL_DIR=${INSTALL_ROOT}/usr/include/GL/ &&
-NV_HEAD_DIR=${INSTALL_ROOT}/usr/share/doc/NVIDIA_GLX-1.0/include/GL &&
-for i in gl.h glext.h glx.h glxext.h ;
-do cp -v ${NV_HEAD_DIR}/$i ${GL_DIR} ;
+local GL_DIR NV_HEAD_DIR i &&
+GL_DIR=$INSTALL_ROOT/usr/include/GL/ &&
+NV_HEAD_DIR=$INSTALL_ROOT/usr/share/doc/NVIDIA_GLX-1.0/include/GL &&
+mkdir -p $GL_DIR &&
+
+for i in gl.h glext.h glx.h glxext.h; do
+ cp -v $NV_HEAD_DIR/$i $GL_DIR
done

==== //sgl/grimoires/z-rejected/z-kernels/nvidia_headers/POST_REMOVE#4
(xtext) ====

@@ -1,8 +1,10 @@
- XFREE_DIR=${INSTALL_ROOT}/usr/include/GL/xfree &&
- GL_DIR=${INSTALL_ROOT}/usr/include/GL/ &&
-message "${MESSAGE_COLOR}REINSTALLING XFREE86 HEADERS ${SPELL_COLOR}"
-for i in gl.h glext.h glx.h glxext.h
-do mv -v ${XFREE_DIR}/$i ${GL_DIR}
-done
-rm -rf ${XFREE_DIR}
+local X_DIR GL_DIR i &&
+X_DIR=$INSTALL_ROOT/usr/include/GL/x &&
+GL_DIR=$INSTALL_ROOT/usr/include/GL/ &&
+message "${MESSAGE_COLOR}Restoring X headers${SPELL_COLOR}" &&
+
+for i in gl.h glext.h glx.h glxext.h; do
+ mv -v $X_DIR/$i $GL_DIR
+done &&

+rm -rf $X_DIR

==== //sgl/grimoires/z-rejected/z-kernels/nvidia_headers/PREPARE#2 (xtext)
====

@@ -1,8 +1,12 @@
#simple hack to remove old cache before it becomes a problem
#PREPARE doesn't know version, atleast old version is covered by "prune"
-NUMBER="$(grep VERSION= $SCRIPT_DIRECTORY/DETAILS | cut -d= -f2)"
-OLDCACHE="$INSTALL_CACHE/$SPELL-$NUMBER-$BUILD.tar.bz2"
-if [ -f $OLDCACHE ] ;
-then rm -rf $OLDCACHE
-fi &&
-message "${SPELL_COLOR} ${SPELL} won't ARCHIVE installed
files${DEFAULT_COLOR}"
+
+local NUMBER OLDCACHE
+NUMBER="$(grep VERSION= $SCRIPT_DIRECTORY/DETAILS | cut -d= -f2)"
+OLDCACHE="$INSTALL_CACHE/$SPELL-$NUMBER-$BUILD.tar.bz2"
+
+if [[ -f $OLDCACHE ]]; then
+ rm -rf $OLDCACHE
+fi &&
+
+message "${SPELL_COLOR}${SPELL} won't ARCHIVE installed
files${DEFAULT_COLOR}"

==== //sgl/grimoires/z-rejected/z-kernels/nvidia_headers/PRE_BUILD#5 (xtext)
====

@@ -1,15 +1,14 @@
-mk_source_dir &&
-message "${SPELL_COLOR}NO SOURCE TO UNPACK TODAY :-)${DEFAULT_COLOR}\n\
-${MESSAGE_COLOR}BACKING UP EXISTING XFREE86 HEADERS${DEFAULT_COLOR}" &&
- XFREE_DIR=${INSTALL_ROOT}/usr/include/GL/xfree &&
- GL_DIR=${INSTALL_ROOT}/usr/include/GL &&
-if ! [ -d ${XFREE_DIR} ]
- then mkdir ${XFREE_DIR}
-fi &&
-if ! [ -f ${XFREE_DIR}/done ]
- then for i in gl.h glext.h glx.h glxext.h ;
- do mv -v ${GL_DIR}/$i ${XFREE_DIR} &&
- touch ${XFREE_DIR}/done
- done
- else message "${SPELL_COLOR}ALREADY BACKED UP STANDARD XFREE86
HEADERS${DEFAULT_COLOR}"
+message "${MESSAGE_COLOR}Backing up existing X headers${DEFAULT_COLOR}" &&
+local X_DIR GL_DIR &&
+X_DIR=$INSTALL_ROOT/usr/include/GL/x &&
+GL_DIR=$INSTALL_ROOT/usr/include/GL &&
+mkdir -p $X_DIR &&
+
+if ! [[ -f $X_DIR/done ]]; then
+ for i in gl.h glext.h glx.h glxext.h; do
+ mv -v $GL_DIR/$i $X_DIR &&
+ touch $X_DIR/done
+ done
+else
+ message "${SPELL_COLOR}X headers already backed up${DEFAULT_COLOR}"
fi



  • [SM-Commit] PERFORCE change 78360 by Juuso Alasuutari for review, Perforce Review Daemon, 04/24/2006

Archive powered by MHonArc 2.6.24.

Top of Page