mail[Wesnoth-commits] r25211 - in /trunk: Makefile.am SConstruct configure.ac src/Makefile.am


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by esr on March 27, 2008 - 22:51:
Author: esr
Date: Thu Mar 27 22:51:30 2008
New Revision: 25211

URL: http://svn.gna.org/viewcvs/wesnoth?rev=25211&view=rev
Log:
Mark things the scons recipe doesn't cover yet.
Implement the sanity checker in the scons recipe.

Modified:
    trunk/Makefile.am
    trunk/SConstruct
    trunk/configure.ac
    trunk/src/Makefile.am

Modified: trunk/Makefile.am
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/Makefile.am?rev=25211&r1=25210&r2=25211&view=diff
==============================================================================
--- trunk/Makefile.am (original)
+++ trunk/Makefile.am Thu Mar 27 22:51:30 2008
@@ -14,6 +14,7 @@
 finddoc=($(finddocdist) | sed -e 's:doc/manual:manual:g' )
 finddocdirs=(cd $(top_srcdir)/doc && find manual -type d \! \( -name .svn 
-prune \) -print; )
 
+# *** Not yet covered by scons recipe
 # This is a workaround to include manpage and manual translation files in the
 # tarball. Manual and manpages are pre-built, so these files aren't actually
 # needed to build Wesnoth, but are included because .po files are the
@@ -28,6 +29,7 @@
            *) f=$$p;; \
          esac;
 
+# *** Not yet covered by scons recipe
 bundle_contents=@PACKAGE_NAME@.app/Contents
 @PACKAGE@_bundle: src/@PACKAGE@
        mkdir -p "$(bundle_contents)/MacOS"
@@ -35,6 +37,7 @@
        echo "APPL????" > "$(bundle_contents)/PkgInfo"
        $(INSTALL_PROGRAM) $< "$(bundle_contents)/MacOS/@PACKAGE_NAME@"
 
+# *** Not yet covered by scons recipe
 bundle_editor_contents=@PACKAGE_NAME@ Editor.app/Contents
 @PACKAGE@_editor_bundle: src/@PACKAGE@_editor
        mkdir -p "$(bundle_editor_contents)/MacOS"
@@ -47,6 +50,7 @@
        cd utils; ./sanity_check
        cd data/tools; make sanity-check
 
+# *** Not yet covered by scons recipe (optipng, dummylocales)
 install-data-local:
        @$(NORMAL_INSTALL)
 if OPTIPNG
@@ -106,6 +110,7 @@
 endif
 endif
 
+# *** Not yet covered by scons recipe
 zip-install: install
        $(top_srcdir)/utils/splittree "$(DESTDIR)$(pkgdatadir)" --zip
 
@@ -187,28 +192,34 @@
     data/tools/wesnoth/__init__.py
 endif
 
+# *** Not yet covered by scons recipe
 update-po:
        @cd po && make $@ || exit $?
 if MANUALUPDATE
        @cd doc/manual && make update-po || exit $?
 endif
 
+# *** Not yet covered by scons recipe
 if PO4AUPDATE
 update-po4a:
        @cd po && make update-po4a || exit $?
        @echo -n "Removing empty man directories... "
        @find doc/man/ -maxdepth 1 -type d -empty -exec rmdir {} \; && \
                echo "done." || exit $?
+
+# *** Not yet covered by scons recipe
 if MANUALUPDATE
        @cd doc/manual && make html || exit $?
 endif
 endif
 
+# *** Not yet covered by scons recipe
 if MANUALUPDATE
 manual-en:
        @cd doc/manual && make manual.en.html || exit $?
 endif
 
+# *** Not yet covered by scons recipe
 # latest graph-includes.pl can be found currently at 
http://ydirson.free.fr/soft/wesnoth/graphs/
 wesnoth-deps.dot:
        PERL5LIB=$(top_srcdir) graph-includes -verbose --class wesnoth 
--consolidate 1-1 \

Modified: trunk/SConstruct
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/SConstruct?rev=25211&r1=25210&r2=25211&view=diff
==============================================================================
--- trunk/SConstruct (original)
+++ trunk/SConstruct Thu Mar 27 22:51:30 2008
@@ -66,6 +66,7 @@
     install-campaignd = install the Wesnoth campaign server
     uninstall = uninstall all executables, tools, and servers
     wesnoth.tgz = make compressed distribution tarball
+    sanity_check = run a pre-release sanity check on the distrivution
 
 """ + opts.GenerateHelpText(env))
 conf = Configure(env)
@@ -716,6 +717,16 @@
            TARCOMSTR="Making tarball...")
 
 #
+# Sanity checking
+#
+sanity_check = env.Command('sanity_check', '', [
+    Action("cd utils; ./sanity_check"),
+    Action("cd data/tools; make sanity-check"),
+    ])
+env.AlwaysBuild(sanity_check)
+env.Precious(sanity_check)
+
+#
 # Known problems:
 #
 # 1. We don't yet check for SDL version too old

Modified: trunk/configure.ac
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/configure.ac?rev=25211&r1=25210&r2=25211&view=diff
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Thu Mar 27 22:51:30 2008
@@ -344,6 +344,7 @@
 AC_PROG_INSTALL
 AM_PROG_CC_C_O
 
+# *** Not yet covered by scons recipe
 # Check for __builtin_expect
 AC_TRY_LINK([int foo (int a) { a = __builtin_expect (a, 10); return a == 10 
? 0 : 1; }],
       [],
@@ -371,6 +372,7 @@
 
 AC_PATH_PROGS([PNGMETA], [pngmeta], [none])
 
+# *** Not yet covered by scons recipe
 if test \( "x$PNGMETA" = "xnone" \) -a \( "x$TINYGUI" = xyes \); then
        AC_MSG_ERROR([*** You must install the pngmeta utility before 
building with -- tinygui.])
 fi
@@ -503,6 +505,7 @@
 AC_SUBST([PNG_LIBS])
 AM_CONDITIONAL([LIBPNG], [test x$pngfound = xyes])
 
+# *** Not yet covered by scons recipe
 # Check for SDL version. Taken from sdl.m4
 
 AC_ARG_ENABLE([sdltest],
@@ -538,7 +541,7 @@
     LIBS="$LIBS $SDL_LIBS"
 
     # Now check if the installed SDL is sufficiently new. (Also sanity
-    # checks the results of sdl-config to some extent
+    # checks the results of sdl-config to some extent)
 
     rm -f conf.sdltest
     AC_RUN_IFELSE([AC_LANG_SOURCE([
@@ -623,6 +626,7 @@
     LIBS="$ac_save_LIBS"
 fi
 
+# *** Not yet covered by scons recipe
 # po4a
 
 AC_PATH_PROGS([PO4A], [po4a], [none])
@@ -671,6 +675,7 @@
 then SDL_LIBS=`$SDL_CONFIG --prefix`/lib/libSDL.la
 else SDL_LIBS=`$SDL_CONFIG --libs`
 fi
+# *** Not yet covered by scons recipe
 case $host_os in
        darwin*)
                SDL_LIBS="-framework Carbon $SDL_LIBS"
@@ -798,6 +803,7 @@
 #######################################################################
 # Check for PNG support in SDL_image                                  #
 #######################################################################
+# *** Not yet covered by scons recipe
 
 AC_LANG([C])
 AC_MSG_CHECKING([for PNG support in SDL_image])
@@ -840,6 +846,7 @@
 #######################################################################
 # Check for OGG support in SDL_mixer                                  #
 #######################################################################
+# *** Not yet covered by scons recipe
 
 if test -e "data/core/music/main_menu.ogg" ; then
     AC_LANG([C])
@@ -959,6 +966,7 @@
 #######################################################################
 # Tune gettext stuff for our needs                                    #
 #######################################################################
+# *** Not yet covered by scons recipe
 
 case $srcdir in
 /*) topdir=$srcdir ;;
@@ -1022,7 +1030,7 @@
                 po/wesnoth-trow/Makefile.in
                 po/wesnoth-tsg/Makefile.in
                 po/wesnoth-utbs/Makefile.in
-po/wesnoth-aoi/Makefile.in
+                po/wesnoth-aoi/Makefile.in
                 m4/Makefile
                 icons/Makefile
                 src/Makefile

Modified: trunk/src/Makefile.am
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/Makefile.am?rev=25211&r1=25210&r2=25211&view=diff
==============================================================================
--- trunk/src/Makefile.am (original)
+++ trunk/src/Makefile.am Thu Mar 27 22:51:30 2008
@@ -479,10 +479,12 @@
     CXXFLAGS += -DPREFERENCES_DIR=\"$(prefsdir)\"
 endif
 
+# *** Not yet covered by scons recipe
 if BOOST_TEST_DYN_LINK
     CXXFLAGS += -DBOOST_TEST_DYN_LINK
 endif
 
+# *** Not yet covered by scons recipe
 if BOOST_AUTO_TEST
     CXXFLAGS += -DWESNOTH_BOOST_AUTO_TEST_MAIN
 else




Related Messages


Powered by MHonArc, Updated Thu Mar 27 23:02:14 2008