From c93482560779c0e137d9598b9e7185338afe2b82 Mon Sep 17 00:00:00 2001 From: Pauli Nieminen Date: Sat, 23 Aug 2008 16:08:37 +0000 Subject: [PATCH] Excluded data/test/ from tarball --- Makefile.am | 2 +- SConstruct | 2 +- data/test/_main.cfg | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index b0567d27ef7..6abad7704f9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,7 +5,7 @@ pkgdatadir=$(datadir)/@DATADIR@ bin_SCRIPTS = # Ignore junk -- object files, editor backup files, wmllint backup files. -findfilterflags=! \( -name .svn -prune -o -name ".\#*" -o -name "*~" -o -name "*bak" -o -name 'Makefile' -o -name '*Makefile' -o -type d \) +findfilterflags=! \( -name .svn -prune -o -name ".\#*" -o -name "*~" -o -name "*bak" -o -name 'Makefile' -o -name '*Makefile' -o -type d -o -wholename "data/test/*" \) # List all datafiles, ignoring junk finddata=(cd $(top_srcdir) && find data fonts icons images sounds $(findfilterflags) -print ) diff --git a/SConstruct b/SConstruct index 8723dbae069..d75e07124d7 100644 --- a/SConstruct +++ b/SConstruct @@ -535,7 +535,7 @@ if 'dist' in COMMAND_LINE_TARGETS: # Speedup, the manifest is expensive def dist_manifest(): "Get an argument list suitable for passing to a distribution archiver." # Start by getting a list of all files under version control - lst = commands.getoutput("svn -v status | awk '/^[^?]/ {print $4;}'").split() + lst = commands.getoutput("svn -v status | grep -v 'data\/test\/.*' | awk '/^[^?]/ {print $4;}'").split() lst = filter(os.path.isfile, lst) return lst dist_tarball = env.Tar('wesnoth-${version}.tar.bz2', []) diff --git a/data/test/_main.cfg b/data/test/_main.cfg index b26102f169b..486002e9f94 100644 --- a/data/test/_main.cfg +++ b/data/test/_main.cfg @@ -5,11 +5,11 @@ #ifdef TEST # Load core wml for tests including macros and units -{@core/} +{@core} #Load test macros -{macros/} +{macros} #Load test scenarios -{scenarios/} +{scenarios} #endif