mail[Wesnoth-commits] r25070 - /trunk/SConstruct


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

Header


Content

Posted by esr on March 24, 2008 - 17:17:
Author: esr
Date: Mon Mar 24 16:32:49 2008
New Revision: 25070

URL: http://svn.gna.org/viewcvs/wesnoth?rev=25070&view=rev
Log:
Installation production is ready, *except* for data directory installation.

Modified:
    trunk/SConstruct

Modified: trunk/SConstruct
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/SConstruct?rev=25070&r1=25069&r2=25070&view=diff
==============================================================================
--- trunk/SConstruct (original)
+++ trunk/SConstruct Mon Mar 24 16:32:49 2008
@@ -30,9 +30,9 @@
 
 # These are implemented in the installation productions
 opts.Add(PathOption('prefix', 'autotools-style installation prefix', 
"/usr/local"))
+opts.Add(PathOption('datadir', 'read-only architecture-independent game 
data', "wesnoth", PathOption.PathAccept))
 
 # FIXME: These are not yet implemented
-opts.Add(PathOption('datadir', 'read-only architecture-independent game 
data', "wesnoth", PathOption.PathAccept))
 opts.Add(BoolOption('lite', 'Set to build lite version of wesnoth (no music 
or large images)', False))
 opts.Add(BoolOption('dummy_locales','Set to enable Wesnoth private locales', 
False))
 opts.Add(PathOption('fifodir', 'directory for the wesnothd fifo socket 
file', "/var/run/wesnothd", PathOption.PathAccept))
@@ -128,33 +128,6 @@
         Exit(1)
 
 env = conf.Finish()
-
-#
-# Generate symbols for use at install time
-#
-
-configsyms = {}
-
-configsyms["DATADIR"] = envdict["datadir"]
-configsyms["LOCALEDIR"] = envdict["localedir"]
-configsyms["PREFERENCES_DIR"] = envdict["prefsdir"]
-configsyms["USE_DUMMYLOCALES"] = envdict["dummy_locales"]
-#configsyms["USE_INTERNAL_DATA"] = envdict["internal_data"]
-
-if "/" in configsyms["LOCALEDIR"]:     # FIXME: Will this break on Windows?
-    configsyms["FULLLOCALEDIR"] = configsyms["LOCALEDIR"]
-    configsyms["HAS_RELATIVE_LOCALEDIR"] = 0
-else:
-    configsyms["FULLLOCALEDIR"] = os.path.join(configsyms["DATADIR"], 
configsyms["LOCALEDIR"])
-    configsyms["HAS_RELATIVE_LOCALEDIR"] = 1
-
-if not envdict["icondir"]:
-    envdict["icondir"] = os.path.join(envdict["datadir"], "icons")
-configsyms["APP_ICON"] = envdict["icondir"]
-
-if not envdict["desktopdir"]:
-    envdict["desktopdir"] = os.path.join(envdict["datadir"], "applicationa")
-configsyms["APP_ENTRY"] = envdict["desktopdir"]
 
 #
 # How to build the Wesnoth configuration file
@@ -674,6 +647,7 @@
 #
 bindir = env['prefix'] + "/bin"
 pythonlib = env['prefix'] + "/lib/python" + sys.version[:3]
+datadir = env['datadir']
 env.Install(bindir, wesnoth)
 env.Install(bindir, wesnoth_editor)
 env.Install(bindir, ['data/tools/wmlscope', 'data/tools/wmllint', 
'data/tools/wmlindent'])
@@ -683,6 +657,7 @@
                         'data/tools/wesnoth/wmliterator.py',
                         'data/tools/wesnoth/campaignserver_client.py',
                         ])
+#env.Install(datadir, 'data')
 env.Alias('install', [bindir, pythonlib])
 
 #




Related Messages


Powered by MHonArc, Updated Mon Mar 24 18:21:55 2008