Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] PERFORCE change 76989 by Andra?? "ruskie" Levstik 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: "Andraž " ruskie " Levstik" <ruskie AT mages.ath.cx>, "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 Kowis" <dkowis+smgl-p4 AT shlrm.org>, "duane_malcolm" <d.malcolm AT auckland.ac.nz>, "Eric Sandall" <eric AT sandall.us>, "George J. Sherwood" <george AT beernabeer.com>, "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>, "Pieter Lenaerts" <e-type AT sourcemage.org>, "Pol Vinogradov" <vin.public AT gmail.com>, "Robin Cook" <rcook AT wyrms.net>, "vladimir_marek" <vlmarek AT volny.cz>
  • Subject: [SM-Commit] PERFORCE change 76989 by Andra?? "ruskie" Levstik for review
  • Date: Wed, 29 Mar 2006 20:15:01 +0100 (BST)

Change 76989 by andraž_levstik AT omega.mages.ath.cx on 2006/03/29 20:11:10

Added missing ChangeLog and some other stuff...

Affected files ...

... //sgl/grimoires/games/ChangeLog#38 edit
... //sgl/grimoires/games/FUNCTIONS#17 edit
... //sgl/grimoires/games/games-data/FUNCTIONS#4 edit
... //sgl/grimoires/games/games-data/freedoom/HISTORY#6 edit
... //sgl/grimoires/games/games-data/freedoom/INSTALL#3 edit
... //sgl/grimoires/games/games-engines/prboom/BUILD#3 edit
... //sgl/grimoires/games/games-engines/prboom/HISTORY#6 edit
... //sgl/grimoires/games/games-engines/prboom/INSTALL#3 edit
... //sgl/grimoires/games/games-engines/prboom/prboom#2 delete
... //sgl/grimoires/games/games-libs/FUNCTIONS#4 edit

Differences ...

==== //sgl/grimoires/games/ChangeLog#38 (text) ====

@@ -1,5 +1,13 @@
+2006-03-29 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * games-data/flight_of_the_amazon_queen: new spell
+ * games-data/beneath_a_steel_sky: new spell
+ * FUNCTIONS: put invoke_gcc from default_build to
+ default_pre_build as per #10641
+ * games-data/FUNCTIONS: cleanup
+ * games-libs/FUNCTIONS: cleanup
+
2006-03-26 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
- * FUNCTIONS: minnor fix
+ * FUNCTIONS: minor fix

2006-03-25 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* FUNCTIONS: added verify_file
@@ -199,4 +207,3 @@
the regular scummvm or scummvm_tools spell. dispel scummvm-cvs and
scummvm_tools-cvs and cast -r -c scummvm scummvm_tools, then just
say yes
to cvs version.
-

==== //sgl/grimoires/games/FUNCTIONS#17 (xtext) ====

@@ -2,33 +2,15 @@
. $GRIMOIRE/libgcc

#---------------------------------------------------------------------
-## Replaces sorcerys default_build with a custom version using
+## Replaces sorcerys default_pre_build with a custom version using
## the invoke_gcc function from libgcc
#---------------------------------------------------------------------
-function default_build () {
+function default_pre_build () {
invoke_gcc &&
- real_default_build
+ real_default_pre_build
}

#---------------------------------------------------------------------
-## @return 0 if glibc was compiled with NPTL
-## @return 1 otherwise
-##
-## Detects if the current glibc includes NPTL support.
-##
-#---------------------------------------------------------------------
-function glibc_is_nptl ()
-{
- if /lib/libc.so.6 | grep -q NPTL; then
- return 0
- fi
- if /lib/libc.so.6 | grep -q "Native POSIX Threads Library"; then
- return 0
- fi
- return 1
-}
-
-#---------------------------------------------------------------------
# Runs update-desktop-database if it is installed
#---------------------------------------------------------------------
function update_desktop_database ()
@@ -40,48 +22,6 @@
}

#---------------------------------------------------------------------
-## this function installs the *.desktop, start* files and qingy links
-## this function is intended to be used by spells for windowmanagers
-#---------------------------------------------------------------------
-function install_wmfiles ()
-{
- local wm_desktopfile_dir="${INSTALL_ROOT}/usr/share/xsessions"
- local wm_startwm_dir="${INSTALL_ROOT}/usr/bin"
-
- # install the start* file for the windowmanager if it's not
- # installed already
- if [ -f ${SCRIPT_DIRECTORY}/start${SPELL} ] ; then
- if ! [ -e ${wm_startwm}/start${SPELL} ] ; then
- install -m 755 ${SCRIPT_DIRECTORY}/start${SPELL} \
- ${wm_startwm_dir}
- fi
- fi
-
- # making sure the destination directory exists
- if ! [ -d ${wm_desktopfile_dir} ] ; then
- mkdir ${wm_desktopfile_dir}
- fi &&
-
- # install the windowmanagers desktop file
- if [ -f ${SCRIPT_DIRECTORY}/${SPELL}.desktop ] ; then
- if ! [ -e ${wm_desktopfile_dir}/${SPELL}.desktop ]; then
- install -m 755 ${SCRIPT_DIRECTORY}/${SPELL}.desktop \
- ${wm_desktopfile_dir}
- fi
- fi
-
- if ( spell_ok qingy ); then
- if [ -x ${wm_startwm_dir}/start${SPELL} ] ; then
- if [ ! -d ${INSTALL_ROOT}/etc/qingy/xsessions ]; then
- install -d -m 755 ${INSTALL_ROOT}/etc/qingy/xsessions
- fi &&
- ln -s ${wm_startwm_dir}/start${SPELL} \
- ${INSTALL_ROOT}/etc/qingy/xsessions/${SPELL}
- fi
- fi
-}
-
-#---------------------------------------------------------------------
## Sets the current script to run only one make job
#---------------------------------------------------------------------

@@ -101,72 +41,6 @@
}

#---------------------------------------------------------------------
-## @param shellname
-## @param full path to shell
-##
-## Adds a shell to /etc/shells and optionally to qingy's sessions
-#---------------------------------------------------------------------
-function install_shell ()
-{
- local qingy_session_dir="${INSTALL_ROOT}/etc/qingy/sessions"
-
- if [ -z "$1" ] ; then
- message "${PROBLEM_COLOR}no shell name specified,
aborting${DEFAULT_COLOR}"
- return 1
- fi &&
- if [ ! -e "$2" ] ; then
- message "${PROBLEM_COLOR} $2 isn't executable, no use adding it as a
shell${DEFAULT_COLOR}"
- return 1
- fi &&
-
- #installing shell into /etc/shells
- message "installing $1 into /etc/shells"
- if ! ( grep -q "${2}" ${INSTALL_ROOT}/etc/shells ) ; then
- echo "$2" >> ${INSTALL_ROOT}/etc/shells
- fi || return 1
-
- #installing shell into qingy's session dir if it's installed
- if ( spell_ok qingy ) && ! [ -f ${qingy_session_dir}/$1 ] ; then
- message "installing $1 into $qingy_session_dir"
- echo "$2" > ${qingy_session_dir}/$1 &&
- chmod 0755 ${qingy_session_dir}/$1
- fi
-}
-
-#---------------------------------------------------------------------
-## @param shellname
-## @param full path to shell
-##
-## Removes a shell from /etc/shells and optionally from qingy's sessions
-#---------------------------------------------------------------------
-function remove_shell ()
-{
- local qingy_session_dir="${INSTALL_ROOT}/etc/qingy/sessions"
-
- if [ -z "$1" ] ; then
- message "${PROBLEM_COLOR}no shell name specified,
aborting${DEFAULT_COLOR}"
- return 1
- fi &&
- if [ -z "$2" ] ; then
- message "${PROBLEM_COLOR}no shell path specified,
aborting${DEFAULT_COLOR}"
- return 1
- fi &&
-
- #removing shell from /etc/shells
- if [ -f /etc/shells ] ; then
- cat /etc/shells|grep -v "$2" > /etc/shells.tmp &&
- mv /etc/shells.tmp /etc/shells
- fi
-
- # and optionally from qingy's session dir
- if [ -f ${qingy_session_dir}/$1 ] ; then
- message "removing $1 from $qingy_session_dir"
- rm -f ${qingy_session_dir}/$1
- fi
-}
-
-
-#---------------------------------------------------------------------
## replacement for config_query_string to work around a short timeout
## when entering long strings (hostnames, organisation names)
#---------------------------------------------------------------------

==== //sgl/grimoires/games/games-data/FUNCTIONS#4 (xtext) ====

@@ -10,24 +10,6 @@
}

#---------------------------------------------------------------------
-## @return 0 if glibc was compiled with NPTL
-## @return 1 otherwise
-##
-## Detects if the current glibc includes NPTL support.
-##
-#---------------------------------------------------------------------
-function glibc_is_nptl ()
-{
- if /lib/libc.so.6 | grep -q NPTL; then
- return 0
- fi
- if /lib/libc.so.6 | grep -q "Native POSIX Threads Library"; then
- return 0
- fi
- return 1
-}
-
-#---------------------------------------------------------------------
# Runs update-desktop-database if it is installed
#---------------------------------------------------------------------
function update_desktop_database ()
@@ -39,48 +21,6 @@
}

#---------------------------------------------------------------------
-## this function installs the *.desktop, start* files and qingy links
-## this function is intended to be used by spells for windowmanagers
-#---------------------------------------------------------------------
-function install_wmfiles ()
-{
- local wm_desktopfile_dir="${INSTALL_ROOT}/usr/share/xsessions"
- local wm_startwm_dir="${INSTALL_ROOT}/usr/bin"
-
- # install the start* file for the windowmanager if it's not
- # installed already
- if [ -f ${SCRIPT_DIRECTORY}/start${SPELL} ] ; then
- if ! [ -e ${wm_startwm}/start${SPELL} ] ; then
- install -m 755 ${SCRIPT_DIRECTORY}/start${SPELL} \
- ${wm_startwm_dir}
- fi
- fi
-
- # making sure the destination directory exists
- if ! [ -d ${wm_desktopfile_dir} ] ; then
- mkdir ${wm_desktopfile_dir}
- fi &&
-
- # install the windowmanagers desktop file
- if [ -f ${SCRIPT_DIRECTORY}/${SPELL}.desktop ] ; then
- if ! [ -e ${wm_desktopfile_dir}/${SPELL}.desktop ]; then
- install -m 755 ${SCRIPT_DIRECTORY}/${SPELL}.desktop \
- ${wm_desktopfile_dir}
- fi
- fi
-
- if ( spell_ok qingy ); then
- if [ -x ${wm_startwm_dir}/start${SPELL} ] ; then
- if [ ! -d ${INSTALL_ROOT}/etc/qingy/xsessions ]; then
- install -d -m 755 ${INSTALL_ROOT}/etc/qingy/xsessions
- fi &&
- ln -s ${wm_startwm_dir}/start${SPELL} \
- ${INSTALL_ROOT}/etc/qingy/xsessions/${SPELL}
- fi
- fi
-}
-
-#---------------------------------------------------------------------
## Sets the current script to run only one make job
#---------------------------------------------------------------------

@@ -100,72 +40,6 @@
}

#---------------------------------------------------------------------
-## @param shellname
-## @param full path to shell
-##
-## Adds a shell to /etc/shells and optionally to qingy's sessions
-#---------------------------------------------------------------------
-function install_shell ()
-{
- local qingy_session_dir="${INSTALL_ROOT}/etc/qingy/sessions"
-
- if [ -z "$1" ] ; then
- message "${PROBLEM_COLOR}no shell name specified,
aborting${DEFAULT_COLOR}"
- return 1
- fi &&
- if [ ! -e "$2" ] ; then
- message "${PROBLEM_COLOR} $2 isn't executable, no use adding it as a
shell${DEFAULT_COLOR}"
- return 1
- fi &&
-
- #installing shell into /etc/shells
- message "installing $1 into /etc/shells"
- if ! ( grep -q "${2}" ${INSTALL_ROOT}/etc/shells ) ; then
- echo "$2" >> ${INSTALL_ROOT}/etc/shells
- fi || return 1
-
- #installing shell into qingy's session dir if it's installed
- if ( spell_ok qingy ) && ! [ -f ${qingy_session_dir}/$1 ] ; then
- message "installing $1 into $qingy_session_dir"
- echo "$2" > ${qingy_session_dir}/$1 &&
- chmod 0755 ${qingy_session_dir}/$1
- fi
-}
-
-#---------------------------------------------------------------------
-## @param shellname
-## @param full path to shell
-##
-## Removes a shell from /etc/shells and optionally from qingy's sessions
-#---------------------------------------------------------------------
-function remove_shell ()
-{
- local qingy_session_dir="${INSTALL_ROOT}/etc/qingy/sessions"
-
- if [ -z "$1" ] ; then
- message "${PROBLEM_COLOR}no shell name specified,
aborting${DEFAULT_COLOR}"
- return 1
- fi &&
- if [ -z "$2" ] ; then
- message "${PROBLEM_COLOR}no shell path specified,
aborting${DEFAULT_COLOR}"
- return 1
- fi &&
-
- #removing shell from /etc/shells
- if [ -f /etc/shells ] ; then
- cat /etc/shells|grep -v "$2" > /etc/shells.tmp &&
- mv /etc/shells.tmp /etc/shells
- fi
-
- # and optionally from qingy's session dir
- if [ -f ${qingy_session_dir}/$1 ] ; then
- message "removing $1 from $qingy_session_dir"
- rm -f ${qingy_session_dir}/$1
- fi
-}
-
-
-#---------------------------------------------------------------------
## replacement for config_query_string to work around a short timeout
## when entering long strings (hostnames, organisation names)
#---------------------------------------------------------------------

==== //sgl/grimoires/games/games-data/freedoom/HISTORY#6 (text) ====

@@ -1,3 +1,6 @@
+2006-03-29 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * INSTALL: add some verbosity to it...
+
2005-12-01 Seth Woolley <seth AT tautology.org>
* DETAILS: MD5 -> SHA512


==== //sgl/grimoires/games/games-data/freedoom/INSTALL#3 (xtext) ====

@@ -1,2 +1,6 @@
-install -d -m 0755 -o root -g games $INSTALL_ROOT/usr/share/games/doom
&&
-cp $SOURCE_DIRECTORY/doom2.wad $INSTALL_ROOT/usr/share/games/doom
+mkdir -vp $INSTALL_ROOT/usr/share/games/doom &&
+chmod 0770 $INSTALL_ROOT/usr/share/games/doom &&
+chown root:games $INSTALL_ROOT/usr/share/games/doom &&
+cp -v $SOURCE_DIRECTORY/doom2.wad $INSTALL_ROOT/usr/share/games/doom &&
+cd $INSTALL_ROOT/usr/share/games/doom &&
+find_and_scam

==== //sgl/grimoires/games/games-engines/prboom/BUILD#3 (xtext) ====

@@ -1,3 +1,1 @@
-INSTBIN="install -m755 -oroot -ggames" &&
-I_DIR=/usr/share/games/doom &&
default_build

==== //sgl/grimoires/games/games-engines/prboom/HISTORY#6 (text) ====

@@ -1,3 +1,8 @@
+2006-03-29 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * INSTALL: cleanup
+ * BUILD: cleanup
+ * prboom: it's smart enough to NOT need a launcher script anymore
+
2005-12-01 Seth Woolley <seth AT tautology.org>
* DETAILS: MD5 -> SHA512


==== //sgl/grimoires/games/games-engines/prboom/INSTALL#3 (xtext) ====

@@ -1,5 +1,3 @@
-default_install &&
-mv /usr/games/prboom ${I_DIR} &&
-${INSTBIN} ${SCRIPT_DIRECTORY}/prboom \
- /usr/games &&
-chown -R root.games ${I_DIR}
+default_install &&
+cd $INSTALL_ROOT/usr/share/games/doom/ &&
+find_and_scam

==== //sgl/grimoires/games/games-libs/FUNCTIONS#4 (xtext) ====

@@ -2,33 +2,6 @@
. $GRIMOIRE/libgcc

#---------------------------------------------------------------------
-## Replaces sorcerys default_build with a custom version using
-## the invoke_gcc function from libgcc
-#---------------------------------------------------------------------
-function default_build () {
- invoke_gcc &&
- real_default_build
-}
-
-#---------------------------------------------------------------------
-## @return 0 if glibc was compiled with NPTL
-## @return 1 otherwise
-##
-## Detects if the current glibc includes NPTL support.
-##
-#---------------------------------------------------------------------
-function glibc_is_nptl ()
-{
- if /lib/libc.so.6 | grep -q NPTL; then
- return 0
- fi
- if /lib/libc.so.6 | grep -q "Native POSIX Threads Library"; then
- return 0
- fi
- return 1
-}
-
-#---------------------------------------------------------------------
# Runs update-desktop-database if it is installed
#---------------------------------------------------------------------
function update_desktop_database ()
@@ -40,48 +13,6 @@
}

#---------------------------------------------------------------------
-## this function installs the *.desktop, start* files and qingy links
-## this function is intended to be used by spells for windowmanagers
-#---------------------------------------------------------------------
-function install_wmfiles ()
-{
- local wm_desktopfile_dir="${INSTALL_ROOT}/usr/share/xsessions"
- local wm_startwm_dir="${INSTALL_ROOT}/usr/bin"
-
- # install the start* file for the windowmanager if it's not
- # installed already
- if [ -f ${SCRIPT_DIRECTORY}/start${SPELL} ] ; then
- if ! [ -e ${wm_startwm}/start${SPELL} ] ; then
- install -m 755 ${SCRIPT_DIRECTORY}/start${SPELL} \
- ${wm_startwm_dir}
- fi
- fi
-
- # making sure the destination directory exists
- if ! [ -d ${wm_desktopfile_dir} ] ; then
- mkdir ${wm_desktopfile_dir}
- fi &&
-
- # install the windowmanagers desktop file
- if [ -f ${SCRIPT_DIRECTORY}/${SPELL}.desktop ] ; then
- if ! [ -e ${wm_desktopfile_dir}/${SPELL}.desktop ]; then
- install -m 755 ${SCRIPT_DIRECTORY}/${SPELL}.desktop \
- ${wm_desktopfile_dir}
- fi
- fi
-
- if ( spell_ok qingy ); then
- if [ -x ${wm_startwm_dir}/start${SPELL} ] ; then
- if [ ! -d ${INSTALL_ROOT}/etc/qingy/xsessions ]; then
- install -d -m 755 ${INSTALL_ROOT}/etc/qingy/xsessions
- fi &&
- ln -s ${wm_startwm_dir}/start${SPELL} \
- ${INSTALL_ROOT}/etc/qingy/xsessions/${SPELL}
- fi
- fi
-}
-
-#---------------------------------------------------------------------
## Sets the current script to run only one make job
#---------------------------------------------------------------------

@@ -101,72 +32,6 @@
}

#---------------------------------------------------------------------
-## @param shellname
-## @param full path to shell
-##
-## Adds a shell to /etc/shells and optionally to qingy's sessions
-#---------------------------------------------------------------------
-function install_shell ()
-{
- local qingy_session_dir="${INSTALL_ROOT}/etc/qingy/sessions"
-
- if [ -z "$1" ] ; then
- message "${PROBLEM_COLOR}no shell name specified,
aborting${DEFAULT_COLOR}"
- return 1
- fi &&
- if [ ! -e "$2" ] ; then
- message "${PROBLEM_COLOR} $2 isn't executable, no use adding it as a
shell${DEFAULT_COLOR}"
- return 1
- fi &&
-
- #installing shell into /etc/shells
- message "installing $1 into /etc/shells"
- if ! ( grep -q "${2}" ${INSTALL_ROOT}/etc/shells ) ; then
- echo "$2" >> ${INSTALL_ROOT}/etc/shells
- fi || return 1
-
- #installing shell into qingy's session dir if it's installed
- if ( spell_ok qingy ) && ! [ -f ${qingy_session_dir}/$1 ] ; then
- message "installing $1 into $qingy_session_dir"
- echo "$2" > ${qingy_session_dir}/$1 &&
- chmod 0755 ${qingy_session_dir}/$1
- fi
-}
-
-#---------------------------------------------------------------------
-## @param shellname
-## @param full path to shell
-##
-## Removes a shell from /etc/shells and optionally from qingy's sessions
-#---------------------------------------------------------------------
-function remove_shell ()
-{
- local qingy_session_dir="${INSTALL_ROOT}/etc/qingy/sessions"
-
- if [ -z "$1" ] ; then
- message "${PROBLEM_COLOR}no shell name specified,
aborting${DEFAULT_COLOR}"
- return 1
- fi &&
- if [ -z "$2" ] ; then
- message "${PROBLEM_COLOR}no shell path specified,
aborting${DEFAULT_COLOR}"
- return 1
- fi &&
-
- #removing shell from /etc/shells
- if [ -f /etc/shells ] ; then
- cat /etc/shells|grep -v "$2" > /etc/shells.tmp &&
- mv /etc/shells.tmp /etc/shells
- fi
-
- # and optionally from qingy's session dir
- if [ -f ${qingy_session_dir}/$1 ] ; then
- message "removing $1 from $qingy_session_dir"
- rm -f ${qingy_session_dir}/$1
- fi
-}
-
-
-#---------------------------------------------------------------------
## replacement for config_query_string to work around a short timeout
## when entering long strings (hostnames, organisation names)
#---------------------------------------------------------------------
@@ -225,49 +90,6 @@
}

#---
-## @Synopsis A function to find all dirs and files and set them to
-## @Synopsis proper permissions.
-#---
-
-function find_and_scam() {
- find ./ -type d -print0 | xargs -0 -n 1 chmod 0750
- find ./ -type d -print0 | xargs -0 -n 1 chown root.games
- find ./ -type f -print0 | xargs -0 -n 1 chmod 0640
- find ./ -type f -print0 | xargs -0 -n 1 chown root.games
-}
-
-#---
-## @Synopsis games_create_base_dirs function to replace
-## @Synopsis all the duplication of the same stuff in games-grimoire
-## @Synopsis and to provide some basics for all spells
-#---
-
-function games_create_base_dirs() {
- mkdir -vp ${INSTALL_ROOT}/usr/share/games/${SPELL}
- mkdir -vp ${INSTALL_ROOT}/usr/games
- mkdir -vp ${INSTALL_ROOT}/var/games
-}
-
-#---
-## @Synopsis games_make_proper_binary function to make all
-## @Synopsis binaries in /usr/games chown root.games and
-## @Synopsis chmod 0750.
-#---
-
-function games_make_proper_binary() {
-if ( grep -q "usr/games/" $IW_LOG )
-then
- cat $IW_LOG | cut -f 3 | sort | grep "usr/games/" | xargs -n 1 chmod 0750
- cat $IW_LOG | cut -f 3 | sort | grep "usr/games/" | xargs -n 1 chown
root.games
-else
- message "${QUERY_COLOR}If you see this message and you're not \n \
-installing a data spell then report this at the following url: \n \
-http://bugs.sourcemage.org/enter_bug.cgi?product=Codex&bug_status=NEW&version=games%20grimoire&component=games%20grimoire&rep_platform=Other&op_sys=other&priority=P2&bug_severity=minor&assigned_to=games%40sourcemage.org&cc=&bug_file_loc=http%3A%2F%2F&short_desc=%24SPELL%20not%20installing%20binaries%20properly&comment=&dependson=&blocked=9312&maketemplate=Remember%20values%20as%20bookmarkable%20template&form_name=enter_bug
\
-${DEFAULT_COLOR}"
-fi
-}
-
-#---
## @Synopsis default_post_install function to
## @Synopsis clean out any empty share/games/SPELL dirs
## @Synopsis and run the real_default_post_install afterwards



  • [SM-Commit] PERFORCE change 76989 by Andra?? "ruskie" Levstik for review, Perforce Review Daemon, 03/29/2006

Archive powered by MHonArc 2.6.24.

Top of Page