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


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

Header


Content

Posted by esr on March 30, 2008 - 13:55:
Author: esr
Date: Sun Mar 30 13:55:53 2008
New Revision: 25319

URL: http://svn.gna.org/viewcvs/wesnoth?rev=25319&view=rev
Log:
Introduce install-clientside alias in scons recipe.

Modified:
    trunk/SConstruct

Modified: trunk/SConstruct
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/SConstruct?rev=25319&r1=25318&r2=25319&view=diff
==============================================================================
--- trunk/SConstruct (original)
+++ trunk/SConstruct Sun Mar 30 13:55:53 2008
@@ -73,7 +73,8 @@
 
     all = same as 'wesnoth wesnoth_editor exploder cutter' (*).
     TAGS = build tags for Emacs (*).
-    install = install 'all' executables, also wmlscope/wmllint/wmlindent.
+    install-clientside = install 'all' executables + 
wmlscope/wmllint/wmlindent.
+    install = synonym for install-clientside
     install-wesnothd = install the Wesnoth multiplayer server.
     install-campaignd = install the Wesnoth campaign server.
     uninstall = uninstall all executables, tools, and servers.
@@ -954,7 +955,7 @@
 # (thus, probably, at target-signature generation time).
 clientside_env.TargetSignatures('build')
 # Install binaries, Python modules, data, and English-language man pages
-env.Alias('install', [
+env.Alias('install-clientside', [
     clientside_env.Install(bindir, clientside),
     clientside_env.Install(bindir, map(lambda tool : 'data/tools/' + tool, 
pythontools)),
     clientside_env.Install(pythonlib, map(lambda module : 
'data/tools/wesnoth/' + module, pythonmodules)),
@@ -978,26 +979,27 @@
 # Icon and desktop files
 if have_client_prereqs and have_X and env["desktop_entry"]:
      if sys.platform == "darwin":
-          env.Alias('install',
+          env.Alias('install-clientside',
                     clientside_env.Install(env["icondir"],
                                            "icons/wesnoth-icon-Mac.png"))
      else:
-          env.Alias('install',
+          env.Alias('install-clientside',
                     clientside_env.Install(env["icondir"],
                                            "icons/wesnoth-icon.png"))
      if sys.platform == "darwin":
-          env.Alias('install',
+          env.Alias('install-clientside',
                     clientside_env.Install(env["icondir"],
                                            
"icons/wesnoth_editor-icon-Mac.png"))
      else:
-          env.Alias('install',
+          env.Alias('install-clientside',
                     clientside_env.Install(env["icondir"],
                                            "icons/wesnoth_editor-icon.png"))
-     env.Alias('install',
+     env.Alias('install-clientside',
                clientside_env.Install(env["desktopdir"],
                                       ["icons/wesnoth.desktop",
                                        "icons/wesnoth_editor.desktop",
                                        ]))
+env.Alias('install', 'install-clientside')
 
 # Wesnoth server install
 wesnothd_env = env.Clone()




Related Messages


Powered by MHonArc, Updated Sun Mar 30 14:21:17 2008