waf: fix install

2021-04-06 23:22:52 +03:00 · 2021-04-06 23:22:52 +03:00 · 4da732b6ab
commit 4da732b6ab
parent 397fe29c73
48 changed files with 36 additions and 75 deletions
--- a/.gitignore
+++ b/.gitignore
@ -6,3 +6,6 @@
 lib/
 *obj_*
 build/
+.waf*
+.lock-waf*
+__pycache__
--- a/appframework/wscript
+++ b/appframework/wscript
@ -36,8 +36,6 @@ def build(bld):

 	libs = []

-	install_path = bld.env.PREFIX
-
 	bld.stlib(
 		source   = source,
 		target   = PROJECT_NAME,
@ -46,7 +44,6 @@ def build(bld):
 		includes = includes,
 		defines  = defines,
 		use      = libs,
-		install_path = install_path,
 		subsystem = bld.env.MSVC_SUBSYSTEM,
 		idx      = bld.get_taskgen_count()
 	)
--- a/bitmap/wscript
+++ b/bitmap/wscript
@ -44,8 +44,6 @@ def build(bld):

 	libs = []

-	install_path = bld.env.PREFIX
-
 	bld.stlib(
 		source   = source,
 		target   = PROJECT_NAME,
@ -54,7 +52,6 @@ def build(bld):
 		includes = includes,
 		defines  = defines,
 		use      = libs,
-		install_path = install_path,
 		subsystem = bld.env.MSVC_SUBSYSTEM,
 		idx      = bld.get_taskgen_count()
 	)
--- a/datacache/wscript
+++ b/datacache/wscript
@ -35,7 +35,7 @@ def build(bld):

 	libs = ['tier0','tier1','tier2','tier3']

-	install_path = bld.env.PREFIX
+	install_path = bld.env.LIBDIR

 	bld.shlib(
 		source   = source,
--- a/datamodel/wscript
+++ b/datamodel/wscript
@ -41,8 +41,6 @@ def build(bld):

 	libs = []

-	install_path = bld.env.PREFIX
-
 	bld.stlib(
 		source   = source,
 		target   = PROJECT_NAME,
@ -51,7 +49,6 @@ def build(bld):
 		includes = includes,
 		defines  = defines,
 		use      = libs,
-		install_path = install_path,
 		subsystem = bld.env.MSVC_SUBSYSTEM,
 		idx      = bld.get_taskgen_count()
 	)
--- a/dmxloader/wscript
+++ b/dmxloader/wscript
@ -35,8 +35,6 @@ def build(bld):

 	libs = []

-	install_path = bld.env.PREFIX
-
 	bld.stlib(
 		source   = source,
 		target   = PROJECT_NAME,
@ -45,7 +43,6 @@ def build(bld):
 		includes = includes,
 		defines  = defines,
 		use      = libs,
-		install_path = install_path,
 		subsystem = bld.env.MSVC_SUBSYSTEM,
 		idx      = bld.get_taskgen_count()
 	)
--- a/engine/voice_codecs/minimp3/wscript
+++ b/engine/voice_codecs/minimp3/wscript
@ -30,7 +30,7 @@ def build(bld):

 	libs = ['tier0','tier1','vstdlib']

-	install_path = bld.env.PREFIX
+	install_path = bld.env.LIBDIR

 	bld.shlib(
 		source   = source,
--- a/engine/wscript
+++ b/engine/wscript
@ -329,7 +329,7 @@ def build(bld):

 	libs = ['tier0','vgui_controls','dmxloader','tier1','tier2','tier3','bitmap','vstdlib','appframework','datamodel','vtf','mathlib','steam_api','matsys_controls','BZIP2','SDL2','JPEG','ZLIB','OPENAL','CURL']

-	install_path = bld.env.PREFIX
+	install_path = bld.env.LIBDIR

 	bld.shlib(
 		source   = source,
--- a/filesystem/wscript
+++ b/filesystem/wscript
@ -44,7 +44,7 @@ def build(bld):

 	libs = ['tier0','tier1','tier2','vstdlib','vpklib']

-	install_path = bld.env.PREFIX
+	install_path = bld.env.LIBDIR

 	bld.shlib(
 		source   = source,
--- a/game/client/wscript
+++ b/game/client/wscript
@ -559,7 +559,7 @@ def build(bld):
 		'RT'
 	]

-	install_path = bld.env.PREFIX
+	install_path = bld.env.PREFIX+'/hl2/bin'

 	bld.shlib(
 		source   = source,
--- a/game/server/wscript
+++ b/game/server/wscript
@ -602,7 +602,7 @@ def build(bld):

 	libs = ['tier0','particles','dmxloader','tier1','tier2','tier3','mathlib','vstdlib','choreoobjects','steam_api']

-	install_path = bld.env.PREFIX
+	install_path = bld.env.PREFIX+'/hl2/bin'

 	bld.shlib(
 		source   = source,
@ -611,6 +611,7 @@ def build(bld):
 		features = 'c cxx',
 		includes = includes,
 		defines  = defines,
+		install_path = install_path,
 		use      = libs,
 		subsystem = bld.env.MSVC_SUBSYSTEM,
 		idx      = bld.get_taskgen_count()
--- a/gameui/wscript
+++ b/gameui/wscript
@ -109,7 +109,7 @@ def build(bld):

 	libs = ['tier0','vgui_controls','tier1','tier2','tier3','vstdlib','vtf','bitmap','mathlib','SDL2','steam_api','matsys_controls','JPEG','PNG']

-	install_path = bld.env.PREFIX
+	install_path = bld.env.LIBDIR

 	bld.shlib(
 		source   = source,
--- a/inputsystem/wscript
+++ b/inputsystem/wscript
@ -35,7 +35,7 @@ def build(bld):

 	libs = ['tier0','tier1','tier2','vstdlib','SDL2','steam_api']

-	install_path = bld.env.PREFIX
+	install_path = bld.env.LIBDIR

 	bld.shlib(
 		source   = source,
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 72b80536ba0aceabc012224970488893c166a0a2
+Subproject commit be91ef6413e2ff771c4484f7d5bd009d3bb90322
--- a/launcher/wscript
+++ b/launcher/wscript
@ -33,7 +33,7 @@ def build(bld):

 	libs = ['tier0','tier1','tier2','tier3','vstdlib','steam_api','appframework','SDL2','togl']

-	install_path = bld.env.PREFIX
+	install_path = bld.env.LIBDIR

 	bld.shlib(
 		source   = source,
--- a/launcher_main/wscript
+++ b/launcher_main/wscript
@ -5,7 +5,7 @@ from waflib import Utils
 import os

 top = '.'
-PROJECT_NAME = 'hl2'
+PROJECT_NAME = 'hl2_launcher'

 def options(opt):
 	# stub
@ -27,7 +27,7 @@ def build(bld):
 		libs += ['USER32', 'SHELL32']
 		source += ['launcher_main.rc']

-	install_path = bld.env.PREFIX
+	install_path = bld.env.BINDIR
 	bld(
 		source   = source,
 		target   = PROJECT_NAME,
--- a/materialsystem/shaderapidx9/wscript
+++ b/materialsystem/shaderapidx9/wscript
@ -58,7 +58,7 @@ def build(bld):

 	libs = ['tier0','tier1','tier2','vstdlib','togl','bitmap','mathlib']

-	install_path = bld.env.PREFIX
+	install_path = bld.env.LIBDIR

 	bld.shlib(
 		source   = source,
--- a/materialsystem/shaderlib/wscript
+++ b/materialsystem/shaderlib/wscript
@ -34,8 +34,6 @@ def build(bld):

 	libs = []

-	install_path = bld.env.PREFIX
-
 	bld.stlib(
 		source   = source,
 		target   = PROJECT_NAME,
@ -44,7 +42,6 @@ def build(bld):
 		includes = includes,
 		defines  = defines,
 		use      = libs,
-		install_path = install_path,
 		subsystem = bld.env.MSVC_SUBSYSTEM,
 		idx      = bld.get_taskgen_count()
 	)
--- a/materialsystem/stdshaders/wscript
+++ b/materialsystem/stdshaders/wscript
@ -150,7 +150,7 @@ def build(bld):

 	libs = ['tier0','shaderlib','tier1','mathlib']

-	install_path = bld.env.PREFIX
+	install_path = bld.env.LIBDIR

 	bld.shlib(
 		source   = source,
--- a/materialsystem/wscript
+++ b/materialsystem/wscript
@ -60,7 +60,7 @@ def build(bld):

 	libs = ['tier0','tier1','tier2','vstdlib','mathlib','bitmap','shaderlib','vtf']

-	install_path = bld.env.PREFIX
+	install_path = bld.env.LIBDIR

 	bld.shlib(
 		source   = source,
--- a/mathlib/wscript
+++ b/mathlib/wscript
@ -1,4 +1,4 @@
-	#! /usr/bin/env python
+#! /usr/bin/env python
 # encoding: utf-8

 from waflib import Utils
@ -52,8 +52,6 @@ def build(bld):

 	libs = []

-	install_path = bld.env.PREFIX
-
 	bld.stlib(
 		source   = source,
 		target   = PROJECT_NAME,
@ -62,7 +60,6 @@ def build(bld):
 		includes = includes,
 		defines  = defines,
 		use      = libs,
-		install_path = install_path,
 		subsystem = bld.env.MSVC_SUBSYSTEM,
 		idx      = bld.get_taskgen_count()
 	)
--- a/scenefilecache/wscript
+++ b/scenefilecache/wscript
@ -32,7 +32,7 @@ def build(bld):

 	libs = ['tier0','tier1']

-	install_path = bld.env.PREFIX
+	install_path = bld.env.LIBDIR

 	bld.shlib(
 		source   = source,
--- a/scripts/waifulib/pycache/compiler_optimizations.cpython-39.pyc
+++ b/scripts/waifulib/pycache/compiler_optimizations.cpython-39.pyc
--- a/scripts/waifulib/pycache/enforce_pic.cpython-39.pyc
+++ b/scripts/waifulib/pycache/enforce_pic.cpython-39.pyc
--- a/scripts/waifulib/pycache/xcompile.cpython-38.pyc
+++ b/scripts/waifulib/pycache/xcompile.cpython-38.pyc
--- a/scripts/waifulib/pycache/xcompile.cpython-39.pyc
+++ b/scripts/waifulib/pycache/xcompile.cpython-39.pyc
--- a/scripts/waifulib/pycache/xshlib.cpython-38.pyc
+++ b/scripts/waifulib/pycache/xshlib.cpython-38.pyc
--- a/scripts/waifulib/pycache/xshlib.cpython-39.pyc
+++ b/scripts/waifulib/pycache/xshlib.cpython-39.pyc
--- a/serverbrowser/wscript
+++ b/serverbrowser/wscript
@ -55,7 +55,7 @@ def build(bld):

 	libs = ['tier0','vgui_controls','mathlib','tier1','tier2','tier3','vstdlib','steam_api']

-	install_path = bld.env.PREFIX
+	install_path = bld.env.LIBDIR

 	bld.shlib(
 		source   = source,
--- a/soundemittersystem/wscript
+++ b/soundemittersystem/wscript
@ -36,7 +36,7 @@ def build(bld):

 	libs = ['tier0','tier1','vstdlib']

-	install_path = bld.env.PREFIX
+	install_path = bld.env.LIBDIR

 	bld.shlib(
 		source   = source,
--- a/studiorender/wscript
+++ b/studiorender/wscript
@ -43,7 +43,7 @@ def build(bld):

 	libs = ['tier0','tier1','tier2','tier3','vstdlib','mathlib','bitmap']

-	install_path = bld.env.PREFIX
+	install_path = bld.env.LIBDIR

 	bld.shlib(
 		source   = source,
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 31ae58f64f9169db7f4e02c83dba46e5a47e0c7b
+Subproject commit ecce0cecc39b32bdf704542e3cb870ba4e2e8e42
--- a/tier0/wscript
+++ b/tier0/wscript
@ -67,7 +67,7 @@ def build(bld):

 	libs = ['DL']

-	install_path = bld.env.PREFIX
+	install_path = bld.env.LIBDIR

 	bld.shlib(
 		source   = source,
--- a/tier1/wscript
+++ b/tier1/wscript
@ -75,8 +75,6 @@ def build(bld):

 	libs = []

-	install_path = bld.env.PREFIX
-
 	bld.stlib(
 		source   = source,
 		target   = PROJECT_NAME,
--- a/tier2/wscript
+++ b/tier2/wscript
@ -49,8 +49,6 @@ def build(bld):

 	libs = []

-	install_path = bld.env.PREFIX
-
 	bld.stlib(
 		source   = source,
 		target   = PROJECT_NAME,
@ -59,7 +57,6 @@ def build(bld):
 		includes = includes,
 		defines  = defines,
 		use      = libs,
-		install_path = install_path,
 		subsystem = bld.env.MSVC_SUBSYSTEM,
 		idx      = bld.get_taskgen_count()
 	)
--- a/tier3/wscript
+++ b/tier3/wscript
@ -37,8 +37,6 @@ def build(bld):

 	libs = []

-	install_path = bld.env.PREFIX
-
 	bld.stlib(
 		source   = source,
 		target   = PROJECT_NAME,
@ -47,7 +45,6 @@ def build(bld):
 		includes = includes,
 		defines  = defines,
 		use      = libs,
-		install_path = install_path,
 		subsystem = bld.env.MSVC_SUBSYSTEM,
 		idx      = bld.get_taskgen_count()
 	)
--- a/togl/wscript
+++ b/togl/wscript
@ -46,7 +46,7 @@ def build(bld):

 	libs = ['tier0','tier1','tier2','vstdlib','mathlib']

-	install_path = bld.env.PREFIX
+	install_path = bld.env.LIBDIR

 	bld.shlib(
 		source   = source,
--- a/vgui2/matsys_controls/wscript
+++ b/vgui2/matsys_controls/wscript
@ -50,8 +50,6 @@ def build(bld):

 	libs = []

-	install_path = bld.env.PREFIX
-
 	bld.stlib(
 		source   = source,
 		target   = PROJECT_NAME,
@ -60,7 +58,6 @@ def build(bld):
 		includes = includes,
 		defines  = defines,
 		use      = libs,
-		install_path = install_path,
 		subsystem = bld.env.MSVC_SUBSYSTEM,
 		idx      = bld.get_taskgen_count()
 	)
--- a/vgui2/src/wscript
+++ b/vgui2/src/wscript
@ -52,7 +52,7 @@ def build(bld):

 	libs = ['tier0','tier1','tier2','tier3','vstdlib','SDL2']

-	install_path = bld.env.PREFIX
+	install_path = bld.env.LIBDIR

 	bld.shlib(
 		source   = source,
--- a/vgui2/vgui_controls/wscript
+++ b/vgui2/vgui_controls/wscript
@ -106,8 +106,6 @@ def build(bld):

 	libs = []

-	install_path = bld.env.PREFIX
-
 	bld.stlib(
 		source   = source,
 		target   = PROJECT_NAME,
@ -116,7 +114,6 @@ def build(bld):
 		includes = includes,
 		defines  = defines,
 		use      = libs,
-		install_path = install_path,
 		subsystem = bld.env.MSVC_SUBSYSTEM,
 		idx      = bld.get_taskgen_count()
 	)
--- a/vgui2/vgui_surfacelib/wscript
+++ b/vgui2/vgui_surfacelib/wscript
@ -38,8 +38,6 @@ def build(bld):

 	libs = []

-	install_path = bld.env.PREFIX
-
 	bld.stlib(
 		source   = source,
 		target   = PROJECT_NAME,
@ -48,7 +46,6 @@ def build(bld):
 		includes = includes,
 		defines  = defines,
 		use      = libs,
-		install_path = install_path,
 		subsystem = bld.env.MSVC_SUBSYSTEM,
 		idx      = bld.get_taskgen_count()
 	)
--- a/vguimatsurface/wscript
+++ b/vguimatsurface/wscript
@ -45,7 +45,7 @@ def build(bld):

 	libs = ['bitmap','mathlib','tier0','vgui_controls','tier1','vstdlib','tier2','tier3','vgui_surfacelib','FT2','FC','SDL2']

-	install_path = bld.env.PREFIX
+	install_path = bld.env.LIBDIR

 	bld.shlib(
 		source   = source,
--- a/video/wscript
+++ b/video/wscript
@ -31,7 +31,7 @@ def build(bld):

 	libs = ['tier0','tier1','tier2','tier3','vstdlib']

-	install_path = bld.env.PREFIX
+	install_path = bld.env.LIBDIR

 	bld.shlib(
 		source   = source,
--- a/vphysics/wscript
+++ b/vphysics/wscript
@ -63,7 +63,7 @@ def build(bld):

 	libs = ['tier0','havana_constraints','hk_math','hk_base','ivp_compactbuilder','ivp_physics','tier1','tier2','vstdlib','mathlib']

-	install_path = bld.env.PREFIX
+	install_path = bld.env.LIBDIR

 	bld.shlib(
 		source   = source,
--- a/vpklib/wscript
+++ b/vpklib/wscript
@ -32,8 +32,6 @@ def build(bld):

 	libs = []

-	install_path = bld.env.PREFIX
-
 	bld.stlib(
 		source   = source,
 		target   = PROJECT_NAME,
@ -42,7 +40,6 @@ def build(bld):
 		includes = includes,
 		defines  = defines,
 		use      = libs,
-		install_path = install_path,
 		subsystem = bld.env.MSVC_SUBSYSTEM,
 		idx      = bld.get_taskgen_count()
 	)
--- a/vstdlib/wscript
+++ b/vstdlib/wscript
@ -40,7 +40,7 @@ def build(bld):

 	libs = ['tier0','tier1']

-	install_path = bld.env.PREFIX
+	install_path = bld.env.LIBDIR

 	bld.shlib(
 		source   = source,
--- a/vtf/wscript
+++ b/vtf/wscript
@ -34,8 +34,6 @@ def build(bld):

 	libs = []

-	install_path = bld.env.PREFIX
-
 	bld.stlib(
 		source   = source,
 		target   = PROJECT_NAME,
@ -44,7 +42,6 @@ def build(bld):
 		includes = includes,
 		defines  = defines,
 		use      = libs,
-		install_path = install_path,
 		subsystem = bld.env.MSVC_SUBSYSTEM,
 		idx      = bld.get_taskgen_count()
 	)
--- a/6
+++ b/6
@ -1,6 +1,6 @@
 #! /usr/bin/env python
 # encoding: utf-8
-# a1batross, mittorn, 2018
+# a1batross, mittorn, nillerusr

 from __future__ import print_function
 from waflib import Logs, Context, Configure
@ -104,8 +104,6 @@ def options(opt):
 	opt.load('reconfigure')

 def configure(conf):
-	conf.env.PREFIX = '.'
-
 	conf.load('fwgslib reconfigure')

 	# Force XP compability, all build targets should add
@ -219,7 +217,7 @@ def configure(conf):
 	if conf.env.DEST_OS != 'android':
 		conf.env.LIBDIR = conf.env.PREFIX+'/bin/'
 		conf.env.BINDIR = conf.env.PREFIX
-
+	else:
 		conf.env.LIBDIR = conf.env.BINDIR = conf.env.PREFIX

 	define_platform(conf)