Navigation

← Previous Changeset
Next Changeset →

Changeset 18783

Timestamp:

05/01/06 10:29:43 (3 years ago)

Author:

patrick

Message:

Finish the job of reducing the hard-coded use of 'vc7' as the Visual Studio
solution/build directory. Now, this directory name is set once and reused.
The value of this change should become apparent soon.

Files:

juggler/trunk/buildwin32.py (modified) (35 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

juggler/trunk/buildwin32.py

r18779	r18783
386	386	cache_file.close()
387	387
388		def generateVersionHeaders(vcDir ~~= 'vc7'~~):
	388	def generateVersionHeaders(vcDir):
389	389	class JugglerModule:
390	390	def __init__(self, srcDir, vcDir, projDir, genFiles = None):
…	…
521	521	m.generateParamFiles()
522	522
523		def generateAntBuildFiles(vcDir ~~= 'vc7'~~):
	523	def generateAntBuildFiles(vcDir):
524	524	class AntTarget:
525	525	def __init__(self, srcdir, vcDir, moduleName, outputFile = 'build.xml',
…	…
739	739	m.generateBuildFile()
740	740
741		def doInstall(prefix):
	741	def doInstall(prefix, buildDir):
742	742	makeTree(prefix)
743		installExternal(prefix)
744		installVPR(prefix)
745		installTweek(prefix)
746		installTweekJava(prefix)
747		installJCCL(prefix)
748		installJCCLJava(prefix)
749		installJCCLPlugins(prefix)
750		installJCCLPluginsJava(prefix)
751		installSonix(prefix)
752		installSonixPlugins(prefix)
753		installGadgeteer(prefix)
754		installGadgeteerDrivers(prefix)
755		installGadgeteerPlugins(prefix)
756		installVRJuggler(prefix)
757		installVRJConfig(prefix)
758		installVRJugglerPlugins(prefix)
759		installVRJugglerPluginsJava(prefix)
	743	installExternal(prefix, buildDir)
	744	installVPR(prefix, buildDir)
	745	installTweek(prefix, buildDir)
	746	installTweekJava(prefix, buildDir)
	747	installJCCL(prefix, buildDir)
	748	installJCCLJava(prefix, buildDir)
	749	installJCCLPlugins(prefix, buildDir)
	750	installJCCLPluginsJava(prefix, buildDir)
	751	installSonix(prefix, buildDir)
	752	installSonixPlugins(prefix, buildDir)
	753	installGadgeteer(prefix, buildDir)
	754	installGadgeteerDrivers(prefix, buildDir)
	755	installGadgeteerPlugins(prefix, buildDir)
	756	installVRJuggler(prefix, buildDir)
	757	installVRJConfig(prefix, buildDir)
	758	installVRJugglerPlugins(prefix, buildDir)
	759	installVRJugglerPluginsJava(prefix, buildDir)
760	760	installMsvcRT(prefix)
761	761
…	…
830	830	installDir(srcdir, destdir, extensions)
831	831
832		def installExternal(prefix):
	832	def installExternal(prefix, buildDir):
833	833	# Install Doozer (even though it probably won't be used).
834	834	printStatus("Installing Doozer ...")
…	…
837	837	installDir(srcdir, destdir, ['.mk'])
838	838
839		def installVPR(prefix):
	839	def installVPR(prefix, buildDir):
840	840	printStatus("Installing VPR headers and libraries ...")
841	841
…	…
844	844	installDir(srcdir, destdir, ['.h'])
845	845
846		srcdir = os.path.join(~~gJugglerDir, 'vc7'~~, 'VPR', 'vpr')
	846	srcdir = os.path.join(buildDir, 'VPR', 'vpr')
847	847	installDir(srcdir, destdir, ['.h'])
848	848
849	849	destdir = os.path.join(prefix, 'lib')
850		srcroot = os.path.join(~~gJugglerDir, 'vc7'~~, 'VPR')
	850	srcroot = os.path.join(buildDir, 'VPR')
851	851	installLibs(srcroot, destdir)
852	852
…	…
864	864	shutil.copy2(os.path.join(srcroot, f), destdir)
865	865
866		def installTweek(prefix):
	866	def installTweek(prefix, buildDir):
867	867	printStatus("Installing Tweek C++ headers, libraries, and data files ...")
868	868
…	…
871	871	installDir(srcdir, destdir, ['.h', '.idl'])
872	872
873		srcdir = os.path.join(~~gJugglerDir, 'vc7'~~, 'Tweek_CXX', 'tweek')
	873	srcdir = os.path.join(buildDir, 'Tweek_CXX', 'tweek')
874	874	installDir(srcdir, destdir, ['.h'])
875	875
876	876	destdir = os.path.join(prefix, 'lib')
877		srcroot = os.path.join(~~gJugglerDir, 'vc7'~~, 'Tweek_CXX')
	877	srcroot = os.path.join(buildDir, 'Tweek_CXX')
878	878	installLibs(srcroot, destdir)
879	879
…	…
895	895	shutil.copy2(os.path.join(srcroot, f), destdir)
896	896
897		def installTweekJava(prefix):
898		srcdir = os.path.join(~~gJugglerDir, 'vc7'~~, 'Tweek_Java')
	897	def installTweekJava(prefix, buildDir):
	898	srcdir = os.path.join(buildDir, 'Tweek_Java')
899	899
900	900	if os.path.exists(os.path.join(srcdir, 'Tweek.jar')):
…	…
988	988	printStatus("Tweek Java API not built. Skipping.")
989	989
990		def installJCCL(prefix):
	990	def installJCCL(prefix, buildDir):
991	991	printStatus("Installing JCCL C++ headers, libraries, and tools ...")
992	992
…	…
1001	1001	installDir(srcdir, destdir, ['.h'])
1002	1002
1003		srcdir = os.path.join(~~gJugglerDir, 'vc7'~~, 'JCCL', 'jccl')
	1003	srcdir = os.path.join(buildDir, 'JCCL', 'jccl')
1004	1004	installDir(srcdir, destdir, ['.h'])
1005	1005
1006	1006	destdir = os.path.join(prefix, 'lib')
1007		srcroot = os.path.join(~~gJugglerDir, 'vc7'~~, 'JCCL')
	1007	srcroot = os.path.join(buildDir, 'JCCL')
1008	1008	installLibs(srcroot, destdir)
1009	1009
…	…
1043	1043	shutil.copy2(os.path.join(srcroot, f), destdir)
1044	1044
1045		def installJCCLPlugins(prefix):
	1045	def installJCCLPlugins(prefix, buildDir):
1046	1046	printStatus("Installing JCCL C++ plug-ins ...")
1047	1047
1048	1048	destdir = os.path.join(prefix, 'lib', 'jccl', 'plugins')
1049		srcroot = os.path.join(~~gJugglerDir, 'vc7'~~, 'JCCL', 'RTRC_Plugin_CXX')
	1049	srcroot = os.path.join(buildDir, 'JCCL', 'RTRC_Plugin_CXX')
1050	1050	installLibs(srcroot, destdir, extensions = ['.dll'])
1051	1051
1052		def installJCCLJava(prefix):
1053		srcdir = os.path.join(~~gJugglerDir, 'vc7'~~, 'JCCL_Java')
	1052	def installJCCLJava(prefix, buildDir):
	1053	srcdir = os.path.join(buildDir, 'JCCL_Java')
1054	1054
1055	1055	if os.path.exists(os.path.join(srcdir, 'jccl_config.jar')):
…	…
1084	1084	printStatus("JCCL Java API not built. Skipping.")
1085	1085
1086		def installJCCLPluginsJava(prefix):
1087		srcdir = os.path.join(~~gJugglerDir, 'vc7'~~, 'JCCL_Java', 'RTRC_Plugin_Java')
	1086	def installJCCLPluginsJava(prefix, buildDir):
	1087	srcdir = os.path.join(buildDir, 'JCCL_Java', 'RTRC_Plugin_Java')
1088	1088
1089	1089	if os.path.exists(os.path.join(srcdir, 'jccl_rtrc.jar')):
…	…
1099	1099	printStatus("JCCL Java plug-ins not built. Skipping.")
1100	1100
1101		def installSonix(prefix):
	1101	def installSonix(prefix, buildDir):
1102	1102	printStatus("Installing Sonix headers, libraries, and samples ...")
1103	1103
…	…
1106	1106	installDir(srcdir, destdir, ['.h'])
1107	1107
1108		srcdir = os.path.join(~~gJugglerDir, 'vc7'~~, 'Sonix', 'snx')
	1108	srcdir = os.path.join(buildDir, 'Sonix', 'snx')
1109	1109	installDir(srcdir, destdir, ['.h'])
1110	1110
1111	1111	destdir = os.path.join(prefix, 'lib')
1112		srcroot = os.path.join(~~gJugglerDir, 'vc7'~~, 'Sonix')
	1112	srcroot = os.path.join(buildDir, 'Sonix')
1113	1113	installLibs(srcroot, destdir)
1114	1114
…	…
1130	1130	shutil.copy2(os.path.join(srcroot, f), destdir)
1131	1131
1132		def installSonixPlugins(prefix):
	1132	def installSonixPlugins(prefix, buildDir):
1133	1133	printStatus("Installing Sonix plug-ins ...")
1134	1134
…	…
1136	1136	destdir_opt = os.path.join(prefix, 'lib', 'snx', 'plugins', 'opt')
1137	1137
1138		srcroot = os.path.join(~~gJugglerDir, 'vc7'~~, 'Sonix', 'OpenAL')
	1138	srcroot = os.path.join(buildDir, 'Sonix', 'OpenAL')
1139	1139	installLibs(srcroot, destdir_dbg, buildTypes = ['DebugDLL'],
1140	1140	extensions = ['.dll'])
…	…
1142	1142	extensions = ['.dll'])
1143	1143
1144		srcroot = os.path.join(~~gJugglerDir, 'vc7'~~, 'Sonix', 'Audiere')
	1144	srcroot = os.path.join(buildDir, 'Sonix', 'Audiere')
1145	1145	installLibs(srcroot, destdir_dbg, buildTypes = ['DebugDLL'],
1146	1146	extensions = ['.dll'])
…	…
1148	1148	extensions = ['.dll'])
1149	1149
1150		def installGadgeteer(prefix):
	1150	def installGadgeteer(prefix, buildDir):
1151	1151	printStatus("Installing Gadgeteer headers, libraries, and samples ...")
1152	1152
…	…
1155	1155	installDir(srcdir, destdir, ['.h'])
1156	1156
1157		srcdir = os.path.join(~~gJugglerDir, 'vc7'~~, 'Gadgeteer', 'gadget')
	1157	srcdir = os.path.join(buildDir, 'Gadgeteer', 'gadget')
1158	1158	installDir(srcdir, destdir, ['.h'])
1159	1159
…	…
1163	1163
1164	1164	destdir = os.path.join(prefix, 'lib')
1165		srcroot = os.path.join(~~gJugglerDir, 'vc7'~~, 'Gadgeteer')
	1165	srcroot = os.path.join(buildDir, 'Gadgeteer')
1166	1166	installLibs(srcroot, destdir)
1167	1167
…	…
1191	1191	shutil.copy2(os.path.join(srcroot, f), destdir)
1192	1192
1193		def installGadgeteerDrivers(prefix):
	1193	def installGadgeteerDrivers(prefix, buildDir):
1194	1194	printStatus("Installing Gadgeteer device drivers ...")
1195	1195
1196	1196	destdir = os.path.join(prefix, 'lib', 'gadgeteer', 'drivers')
1197		srcroot = os.path.join(~~gJugglerDir, 'vc7'~~, 'Gadgeteer')
	1197	srcroot = os.path.join(buildDir, 'Gadgeteer')
1198	1198
1199	1199	drivers = ['DTrack', 'DataGlove', 'DirectXJoystick', 'Ether24',
…	…
1206	1206	installLibs(srcdir, destdir, extensions = ['.dll'])
1207	1207
1208		def installGadgeteerPlugins(prefix):
	1208	def installGadgeteerPlugins(prefix, buildDir):
1209	1209	printStatus("Installing Gadgeteer cluster plug-ins ...")
1210	1210
…	…
1216	1216
1217	1217	destdir = os.path.join(prefix, 'lib', 'gadgeteer', 'plugins')
1218		srcroot = os.path.join(~~gJugglerDir, 'vc7'~~, 'Gadgeteer')
	1218	srcroot = os.path.join(buildDir, 'Gadgeteer')
1219	1219
1220	1220	plugins = ['ApplicationDataManager', 'RemoteInputManager',
…	…
1225	1225	installLibs(srcdir, destdir, extensions = ['.dll'])
1226	1226
1227		def installVRJuggler(prefix):
	1227	def installVRJuggler(prefix, buildDir):
1228	1228	printStatus("Installing VR Juggler headers, libraries, and samples ...")
1229	1229
…	…
1232	1232	installDir(srcdir, destdir, ['.h'])
1233	1233
1234		srcdir = os.path.join(~~gJugglerDir, 'vc7'~~, 'VRJuggler', 'vrj')
	1234	srcdir = os.path.join(buildDir, 'VRJuggler', 'vrj')
1235	1235	installDir(srcdir, destdir, ['.h'])
1236	1236
1237	1237	destdir = os.path.join(prefix, 'lib')
1238		srcroot = os.path.join(~~gJugglerDir, 'vc7'~~, 'VRJuggler')
	1238	srcroot = os.path.join(buildDir, 'VRJuggler')
1239	1239	installLibs(srcroot, destdir)
1240	1240
1241		srcroot = os.path.join(gJugglerDir, 'vc7', 'VRJuggler',
1242		'OpenGL_Draw_Manager')
	1241	srcroot = os.path.join(buildDir, 'VRJuggler', 'OpenGL_Draw_Manager')
1243	1242	installLibs(srcroot, destdir)
1244	1243
1245		srcroot = os.path.join(gJugglerDir, 'vc7', 'VRJuggler',
1246		'Performer_Draw_Manager')
	1244	srcroot = os.path.join(buildDir, 'VRJuggler', 'Performer_Draw_Manager')
1247	1245	installLibs(srcroot, destdir)
1248	1246
…	…
1272	1270	shutil.copy2(os.path.join(srcroot, f), destdir)
1273	1271
1274		def installVRJConfig(prefix):
1275		jardir = os.path.join(~~gJugglerDir, 'vc7'~~, 'VRJConfig')
	1272	def installVRJConfig(prefix, buildDir):
	1273	jardir = os.path.join(buildDir, 'VRJConfig')
1276	1274
1277	1275	if os.path.exists(os.path.join(jardir, 'VRJConfig.jar')):
…	…
1359	1357	printStatus("VRJConfig not built. Skipping.")
1360	1358
1361		def installVRJugglerPlugins(prefix):
	1359	def installVRJugglerPlugins(prefix, buildDir):
1362	1360	printStatus("Installing VR Juggler C++ plug-ins ...")
1363	1361
1364	1362	destdir = os.path.join(prefix, 'lib', 'vrjuggler', 'plugins')
1365		srcroot = os.path.join(gJugglerDir, 'vc7', 'VRJugglerPlugins',
1366		'Perf_Plugin_CXX')
	1363	srcroot = os.path.join(buildDir, 'VRJugglerPlugins', 'Perf_Plugin_CXX')
1367	1364	installLibs(srcroot, destdir, extensions = ['.dll'])
1368	1365
1369		def installVRJugglerPluginsJava(prefix):
1370		srcdir = os.path.join(gJugglerDir, 'vc7', 'VRJugglerPlugins',
1371		'Perf_Plugin_Java')
	1366	def installVRJugglerPluginsJava(prefix, buildDir):
	1367	srcdir = os.path.join(buildDir, 'VRJugglerPlugins', 'Perf_Plugin_Java')
1372	1368
1373	1369	plugins = [('PerformanceMonitor', 'corba_perf_mon')]
…	…
1579	1575	self.mOptions = options
1580	1576	self.mTkOptions = {}
	1577	self.mVcDir = 'vc7'
1581	1578
1582	1579	# Make a StringVar dictionary.
…	…
1887	1884
1888	1885	def installJuggler(self):
1889		doInstall(self.mTkOptions['prefix'].get())
	1886	doInstall(self.mTkOptions['prefix'].get(),
	1887	os.path.join(gJugglerDir, self.mVcDir))
1890	1888
1891	1889	def installDeps(self):
…	…
1950	1948	if self.mRoot.CommandFrame.InstallJugglerCheck.Variable.get() == "Yes":
1951	1949	self.printMessage("Installing Juggler...")
1952		doInstall(self.mTkOptions['prefix'].get())
	1950	doInstall(self.mTkOptions['prefix'].get(),
	1951	os.path.join(gJugglerDir, self.mVcDir))
1953	1952
1954	1953	if self.mRoot.CommandFrame.InstallJugglerDepsCheck.Variable.get() == "Yes":
…	…
1962	1961	#print "generateVersionHeaders()"
1963	1962	self.printMessage("Generating Version Headers.")
1964		generateVersionHeaders()
	1963	generateVersionHeaders(self.mVcDir)
1965	1964	self.printMessage("Generating Ant Build Files.")
1966		generateAntBuildFiles()
	1965	generateAntBuildFiles(self.mVcDir)
1967	1966
1968	1967	devenv_cmd = getVSCmd()
…	…
1970	1969	devenv_cmd_no_exe = '"%s"' % (devenv_cmd_no_exe)
1971	1970
1972		solution_file = r'"%s"' % os.path.join(gJugglerDir, 'vc7', 'Juggler.sln')
	1971	solution_file = r'"%s"' % os.path.join(gJugglerDir, self.mVcDir,
	1972	'Juggler.sln')
1973	1973	build_args = r'/build DebugDLL'
1974	1974
…	…
2047	2047	if not gHaveTk or disable_tk:
2048	2048	options = setVars()
2049		generateVersionHeaders()
2050		generateAntBuildFiles()
	2049	vc_dir = 'vc7'
	2050	generateVersionHeaders(vc_dir)
	2051	generateAntBuildFiles(vc_dir)
2051	2052
2052	2053	devenv_cmd = getVSCmd()
2053		solution_file = r'%s' % os.path.join(gJugglerDir, ~~'vc7'~~, 'Juggler.sln')
	2054	solution_file = r'%s' % os.path.join(gJugglerDir, vc_dir, 'Juggler.sln')
2054	2055
2055	2056	try:
…	…
2060	2061	proceed = sys.stdin.readline().strip(" \n")
2061	2062	if proceed == '' or proceed.lower().startswith('y'):
2062		doInstall(options['prefix'])
	2063	doInstall(options['prefix'], os.path.join(gJugglerDir, vc_dir))
2063	2064
2064	2065	print "Proceed with VR Juggler dependency installation [y]: ",

Navigation

Changeset 18783

Legend:

juggler/trunk/buildwin32.py

Download in other formats: