GNOME.org
 

[gnome-games] build: Drop blackjack

commit 2ad4088ddc74083fba2611d0e9acceb4a7ecf2a8
Author: Christian Persch <chpe gnome org>
Date:   Fri Oct 16 19:05:58 2009 +0200

    build: Drop blackjack

 .gitignore                                         |    1 -
 COPYING.README                                     |    2 +-
 MAINTAINERS                                        |    3 -
 README                                             |    5 +-
 TODO                                               |    6 -
 blackjack/AUTHORS                                  |    2 -
 blackjack/ChangeLog.old                            |  814 ------------
 blackjack/Makefile.am                              |    5 -
 blackjack/data/Ameristar.rules                     |   13 -
 blackjack/data/Atlantic_City.rules                 |   13 -
 blackjack/data/Makefile.am                         |   31 -
 blackjack/data/Vegas_Downtown.rules                |   13 -
 blackjack/data/Vegas_Strip.rules                   |   13 -
 blackjack/data/blackjack.6                         |  135 --
 blackjack/data/blackjack.desktop.in.in             |   13 -
 blackjack/data/blackjack.schemas.in                |   88 --
 blackjack/help/C/blackjack.xml                     |  876 -------------
 blackjack/help/C/blackjack.xml.old                 |  119 --
 .../help/C/figures/blackjack_start_window.png      |  Bin 9867 -> 0 bytes
 blackjack/help/C/figures/blackjack_win_window.png  |  Bin 16894 -> 0 bytes
 blackjack/help/C/legal.xml                         |   76 --
 blackjack/help/ChangeLog.old                       |   93 --
 blackjack/help/Makefile.am                         |   14 -
 blackjack/help/blackjack.omf.in                    |    9 -
 blackjack/help/ca/ca.po                            | 1000 ---------------
 .../help/ca/figures/blackjack_start_window.png     |  Bin 71406 -> 0 bytes
 blackjack/help/cs/cs.po                            |  998 ---------------
 .../help/cs/figures/blackjack_start_window.png     |  Bin 64403 -> 0 bytes
 blackjack/help/da/da.po                            | 1011 ---------------
 blackjack/help/de/de.po                            |  969 --------------
 .../help/de/figures/blackjack_start_window.png     |  Bin 65470 -> 0 bytes
 blackjack/help/el/el.po                            | 1088 ----------------
 .../help/el/figures/blackjack_start_window.png     |  Bin 71777 -> 0 bytes
 blackjack/help/el/figures/blackjack_win_window.png |  Bin 118916 -> 0 bytes
 blackjack/help/en_GB/en_GB.po                      |  986 ---------------
 blackjack/help/es/es.po                            | 1028 ---------------
 .../help/es/figures/blackjack_start_window.png     |  Bin 65676 -> 0 bytes
 blackjack/help/es/figures/blackjack_win_window.png |  Bin 94494 -> 0 bytes
 blackjack/help/eu/eu.po                            |  990 ---------------
 .../help/fr/figures/blackjack_start_window.png     |  Bin 69413 -> 0 bytes
 blackjack/help/fr/fr.po                            | 1017 ---------------
 blackjack/help/oc/oc.po                            |  803 ------------
 .../help/sv/figures/blackjack_start_window.png     |  Bin 70267 -> 0 bytes
 blackjack/help/sv/figures/blackjack_win_window.png |  Bin 85968 -> 0 bytes
 blackjack/help/sv/sv.po                            |  640 ----------
 blackjack/pixmaps/Makefile.am                      |   13 -
 blackjack/pixmaps/baize.png                        |  Bin 1193 -> 0 bytes
 blackjack/pixmaps/blackjack-splash.png             |  Bin 11216 -> 0 bytes
 blackjack/pixmaps/chip-1.svg                       |   11 -
 blackjack/pixmaps/chip-100.svg                     |   13 -
 blackjack/pixmaps/chip-25.svg                      |   12 -
 blackjack/pixmaps/chip-5.svg                       |   11 -
 blackjack/pixmaps/white-outline.svg                |    5 -
 blackjack/src/Makefile.am                          |   68 -
 blackjack/src/blackjack.cpp                        |  705 -----------
 blackjack/src/blackjack.h                          |  129 --
 blackjack/src/card-selector.cpp                    |  150 ---
 blackjack/src/card-selector.h                      |   60 -
 blackjack/src/card.cpp                             |  205 ---
 blackjack/src/card.h                               |   70 -
 blackjack/src/chips.cpp                            |  357 ------
 blackjack/src/chips.h                              |  109 --
 blackjack/src/dialog.cpp                           |  433 -------
 blackjack/src/dialog.h                             |   31 -
 blackjack/src/draw.cpp                             |  349 -----
 blackjack/src/draw.h                               |   51 -
 blackjack/src/events.cpp                           |  720 -----------
 blackjack/src/events.h                             |   35 -
 blackjack/src/game.cpp                             |  527 --------
 blackjack/src/game.h                               |   76 --
 blackjack/src/hand.cpp                             |  679 ----------
 blackjack/src/hand.h                               |   53 -
 blackjack/src/menu.cpp                             |  166 ---
 blackjack/src/menu.h                               |   39 -
 blackjack/src/player.cpp                           | 1037 ---------------
 blackjack/src/player.h                             |  156 ---
 blackjack/src/press_data.cpp                       |  281 ----
 blackjack/src/press_data.h                         |   77 --
 blackjack/src/slot.cpp                             |  303 -----
 blackjack/src/slot.h                               |   83 --
 blackjack/src/splash.cpp                           |  131 --
 blackjack/src/splash.h                             |   32 -
 blackjack/src/strategy.cpp                         | 1332 --------------------
 blackjack/src/strategy.h                           |  517 --------
 configure.in                                       |   28 +-
 icons/Makefile.am                                  |   11 -
 icons/hicolor_apps_16x16_gnome-blackjack.png       |  Bin 855 -> 0 bytes
 icons/hicolor_apps_22x22_gnome-blackjack.png       |  Bin 1204 -> 0 bytes
 icons/hicolor_apps_24x24_gnome-blackjack.png       |  Bin 1257 -> 0 bytes
 icons/hicolor_apps_32x32_gnome-blackjack.png       |  Bin 1774 -> 0 bytes
 icons/hicolor_apps_48x48_gnome-blackjack.png       |  Bin 3556 -> 0 bytes
 icons/hicolor_apps_scalable_gnome-blackjack.svg    | 1144 -----------------
 libgames-support/games-runtime.c                   |    2 +-
 po/POTFILES.in                                     |   12 -
 po/POTFILES.skip                                   |    1 -
 95 files changed, 7 insertions(+), 23091 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 239c648..a22d269 100644
--- a/.gitignore
+++ b/.gitignore
@@ -84,7 +84,6 @@ py-compile
 # Game-specific
 #
 aisleriot/sol
-blackjack/src/blackjack
 dependencies/gnuchess/gnome-gnuchess
 glchess/src/glchess.in
 glchess/src/lib/defaults.py
diff --git a/COPYING.README b/COPYING.README
index 98b81ed..a27cec8 100644
--- a/COPYING.README
+++ b/COPYING.README
@@ -1,4 +1,4 @@
 This code is licensed as follows:
-- libgamescards in libgames-support/, aisleriot, and blackjack: GPL 3-or-later
+- libgamescards in libgames-support/, and aisleriot: GPL 3-or-later
 - all other code in libgames-support/ is either LGPL 2-or-later or GPL 2-or-later
 - all other games are GPL 2-or-later
diff --git a/MAINTAINERS b/MAINTAINERS
index 8d996e7..ef0dabd 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -17,6 +17,3 @@ Userid: jclinton
 ##
 # Callum McKenzie <callum spooky-possum org> (versions 2.3 to 2.16)
 # Andreas Røsdal <andreasr gnome org>  (versions 2.16 to 2.19)
-#
-# If blackjack breaks you should probably talk to:
-# William Jon McCann  <mccann jhu edu>
diff --git a/README b/README
index dde65f4..7ec8a95 100644
--- a/README
+++ b/README
@@ -40,9 +40,6 @@ command line.
 AisleRiot       A compilation of seventy different solitaire card games.
                 (sol)
 
-Blackjack       The casino card game without any need to actually pay
-                your gambling debts. (blackjack)
-
 Four-in-a-row   The classic game where each player tries to make a line
                 of four disks before their opponent. There is a very
                 popular version of this in the real world called
@@ -262,7 +259,7 @@ compile with ./configure --disable-gnuchess
 
 The games that require additional packages are:
  guile scheme:  	AisleRiot
- C++:         		Blackjack, Gnometris            
+ C++:         		Gnometris
  Python:		glchess, gnome-sudoku
 
 Building Gnome-Games
diff --git a/TODO b/TODO
index 2ae6054..78869b6 100644
--- a/TODO
+++ b/TODO
@@ -17,12 +17,6 @@ AisleRiot:
         - Find out what's wrong with block-ten.
         - Final missing features from stand-alone freecell (bug 124522).
 
-Blackjack:
-        - Eliminate the splash screen (and hopefully any recalculation).
-        - Multiplayer (bug 129639)
-        - Training mode (bug 129638)
-        - Rules dialog clean-up (bug 124613)
-
 Gnect:
         - Graphics (could we share some with iagno/gataxx)
 
diff --git a/configure.in b/configure.in
index cfbbe99..89de537 100644
--- a/configure.in
+++ b/configure.in
@@ -23,7 +23,7 @@ AM_MAINTAINER_MODE([enable])
 # we support and which features to check for
 
 # This is the canonical list of all game subdirectories.
-allgames="aisleriot blackjack gnometris gnect gnomine same-gnome mahjongg gtali gnotravex gnotski glines iagno glchess gnobots2 gnibbles gnome-sudoku lightsoff"
+allgames="aisleriot gnometris gnect gnomine same-gnome mahjongg gtali gnotravex gnotski glines iagno glchess gnobots2 gnibbles gnome-sudoku lightsoff"
 AC_SUBST([allgames])
 staginggames="same-gnome-clutter"
 AC_SUBST([staginggames])
@@ -112,7 +112,6 @@ need_cxx=no
 need_rsvg=no
 need_guile=no
 need_python=no
-need_libxml=no
 need_clutter=no
 need_dbus_glib=no
 want_sound=no
@@ -125,7 +124,7 @@ build_libgamescards=no
 
 for game in $gamelist; do
   case $game in
-    gnometris|blackjack) need_cxx=yes ;;
+    gnometris) need_cxx=yes ;;
     *) ;;
   esac
   case $game in
@@ -149,7 +148,7 @@ for game in $gamelist; do
     *) disallow_hildon=yes ;;
   esac
   case $game in
-    aisleriot|blackjack) ;;
+    aisleriot) ;;
     *) need_rsvg=yes ;;
   esac
   case $game in
@@ -157,10 +156,6 @@ for game in $gamelist; do
     *) ;;
   esac
   case $game in
-    blackjack) need_libxml=yes ;;
-    *) ;;
-  esac
-  case $game in
     gnometris|lightsoff|same-gnome-clutter|gnibbles) need_clutter=yes ;;
     *) ;;
   esac
@@ -173,7 +168,7 @@ for game in $gamelist; do
     *) libgames_support_full=yes ;;
   esac
   case $game in
-    aisleriot|blackjack) build_libgamescards=yes ;;
+    aisleriot) build_libgamescards=yes ;;
     *) ;;
   esac
 done
@@ -191,7 +186,6 @@ for game in $gamelist; do
 done
 
 AM_CONDITIONAL([BUILD_AISLERIOT],[test "$build_aisleriot" = "yes"])
-AM_CONDITIONAL([BUILD_BLACKJACK],[test "$build_blackjack" = "yes"])
 AM_CONDITIONAL([BUILD_GLCHESS],[test "$build_glchess" = "yes"])
 AM_CONDITIONAL([BUILD_GLINES],[test "$build_glines" = "yes"])
 AM_CONDITIONAL([BUILD_GNECT],[test "$build_gnect" = "yes"])
@@ -563,14 +557,6 @@ AC_SUBST([GTK_LIBS])
 AM_GCONF_SOURCE_2
 AC_PATH_PROG([GCONFTOOL],[gconftool-2])
 
-# Check for libXML2
-
-if test "$need_libxml" = "yes"; then
-  PKG_CHECK_MODULES([XML],[libxml-2.0 >= $LIBXML_REQUIRED])
-  AC_SUBST([XML_CFLAGS])
-  AC_SUBST([XML_LIBS])
-fi
-
 # Check for GNOME modules
 
 if test "$with_platform" = "gnome"; then
@@ -1109,11 +1095,6 @@ po/Makefile.in
 icons/Makefile
 sounds/Makefile
 libgames-support/Makefile
-blackjack/Makefile
-blackjack/data/Makefile
-blackjack/help/Makefile
-blackjack/pixmaps/Makefile
-blackjack/src/Makefile
 gnect/Makefile
 gnect/src/Makefile
 gnect/data/Makefile
@@ -1184,7 +1165,6 @@ gnibbles/gnibbles.desktop.in
 gnotski/gnotski.desktop.in
 glchess/glchess.desktop.in
 mahjongg/mahjongg.desktop.in
-blackjack/data/blackjack.desktop.in
 gtali/gtali.desktop.in
 gnome-sudoku/gnome-sudoku.desktop.in
 iagno/iagno.desktop.in
diff --git a/icons/Makefile.am b/icons/Makefile.am
index f017dd8..ad0716d 100644
--- a/icons/Makefile.am
+++ b/icons/Makefile.am
@@ -42,17 +42,6 @@ endif # HAVE_HILDON
 
 endif # BUILD_AISLERIOT
 
-if BUILD_BLACKJACK
-dist_noinst_DATA += \
-	hicolor_apps_16x16_gnome-blackjack.png \
-	hicolor_apps_22x22_gnome-blackjack.png \
-	hicolor_apps_24x24_gnome-blackjack.png \
-	hicolor_apps_32x32_gnome-blackjack.png \
-	hicolor_apps_48x48_gnome-blackjack.png \
-	hicolor_apps_scalable_gnome-blackjack.svg \
-	$(NULL)
-endif
-
 if BUILD_GLCHESS
 dist_noinst_DATA += \
 	hicolor_apps_16x16_gnome-glchess.png \
diff --git a/libgames-support/games-runtime.c b/libgames-support/games-runtime.c
index 8f16879..1a23239 100644
--- a/libgames-support/games-runtime.c
+++ b/libgames-support/games-runtime.c
@@ -385,7 +385,7 @@ games_runtime_init (const char *name)
   retval = TRUE;
 #endif /* ENABLE_BINRELOC */
 
-  if (strcmp (app_name, "aisleriot") == 0 || strcmp (app_name, "blackjack") == 0) {
+  if (strcmp (app_name, "aisleriot") == 0) {
     gpl_version = 3;
   } else {
     gpl_version = 2;
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3f21092..c6957e8 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -99,18 +99,6 @@ aisleriot/rules/will_o_the_wisp.scm
 aisleriot/rules/yield.scm
 aisleriot/rules/yukon.scm
 aisleriot/rules/zebra.scm
-blackjack/data/blackjack.desktop.in.in
-blackjack/data/blackjack.schemas.in
-blackjack/src/blackjack.cpp
-blackjack/src/card.cpp
-blackjack/src/card-selector.cpp
-blackjack/src/dialog.cpp
-blackjack/src/events.cpp
-blackjack/src/game.cpp
-blackjack/src/hand.cpp
-blackjack/src/menu.cpp
-blackjack/src/player.cpp
-blackjack/src/splash.cpp
 glchess/gnuchess/getopt.c
 glchess/data/glchess.schemas.in
 [type: gettext/glade]glchess/data/chess_view.ui
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 0c945da..357de11 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,6 +1,5 @@
 aisleriot/freecell.desktop.in
 aisleriot/sol.desktop.in
-blackjack/data/blackjack.desktop.in
 glchess/glchess.desktop.in
 glchess/src/lib/defaults.py
 glines/glines.desktop.in
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]