a7efd0d8dd
Merged in viewer-2.0.0-3 changes up through r129050. Boost got clobbered so I'll need to rebuild that, plus a couple other minor clenaups.
2009-07-30 19:39:08 -07:00
be7e9a46db
Merge in disabling of universal builds.
...
PPC is now oficially deprecated.
svn merge -r 127807:128098 svn+ssh://svn.lindenlab.com/svn/linden/branches/brad/killppc-1
2009-07-24 01:31:53 +00:00
ccba924dac
1st attempt at disabling ppc build on macs.
2009-07-16 11:20:16 -07:00
7aec119d84
Merge with SVN login-api-3 branch
2009-06-25 11:12:51 -07:00
7e84d9125e
Fix Mac Build
2009-06-24 15:13:53 +00:00
351ebe9fcb
result of "svn merge -r123757:124890 svn+ssh://svn.lindenlab.com/svn/linden/branches/improve-unit-testing/iface-04" for QAR-1496
2009-06-19 23:24:11 +00:00
f9b9372027
Remove -parallelizeTargets from xcodebuild invocation, it seems to not work well enough
2009-06-03 23:18:22 +00:00
93cf3d89e5
Put the os.environ["DISTCC"] = ... call into main()
2009-05-21 21:25:09 +00:00
77c1e2b761
Fix develop.py putenv bug, use new etch build-linux hosts for parabuild.
2009-05-21 20:59:56 +00:00
8c5ca38f1d
Fix to develop.py to build on 64 bit windows.
...
Added March 2009 DirectX SDK to cmake config.
Reviewed by brad
2009-05-19 23:41:59 +00:00
0257214763
Set DISTCC_DIR to a location inside the source tree to avoid causing NFS trouble with the default setting.
2009-05-14 21:20:37 +00:00
65c86eadcb
Max out distcc jobs to 12 in develop.py
2009-05-14 20:56:03 +00:00
32100098f5
There are 71 eniacs, not just 64
2009-05-14 20:26:00 +00:00
21a8d1f638
Make develop.py work on eniacs the same way it works on stations
2009-05-14 19:24:24 +00:00
4bcbf33422
svn merge -r118008:118374 svn+ssh://svn.lindenlab.com/svn/linden/branches/cg/viewer-etch-1
...
QAR-1459 etch builds enabled
2009-04-30 06:52:38 +00:00
c7c34d9ad2
Working around DEV-30401 by yanking the etch 32bit build code until the viewer also builds on etch
2009-04-10 01:14:30 +00:00
1aca3ff6f5
Get 32-bit builds going on 64-bit Debian Etch.
...
Reviewed by Brad.
2009-04-09 18:05:56 +00:00
5476aca88e
DEV-16956 - Print a more useful error message if cmake is not found
...
Reviewed by Poppy.
2009-01-09 22:28:17 +00:00
e3cf284388
Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2009-01-08 00:05:06 +00:00
fb793870fe
QAR-1142 merging 1.22 RC0-RC4 changes.
...
svn merge -c 106471 svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_1-22-106055_merge
2008-12-23 19:39:58 +00:00
fd46865a50
QAR-1040 maint-viewer-11 + OpenAL combo mergeme
...
svn merge -c104451
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/openal-maint-viewer-11-combo-r104448
2008-12-02 20:35:40 +00:00
ac68eb16a2
Merging the changes in viewer_1-22-0 (1.22 RC0) back into trunk, revs. 101837 to 103519
2008-11-21 01:18:39 +00:00
2a44e81675
QAR-1018 Lightweight Windows Setup App (windows-setup-3). svn merge -r102882:102883 svn+ssh://svn.lindenlab.com/svn/linden/branches/windows-setup/windows-setup-3-merge
2008-11-19 23:26:29 +00:00
c4d32870e1
Fix heinous traceback if commands are not found
2008-10-31 18:23:00 +00:00
d6d286775d
Windows build: only run vstool.exe once per build type.
...
Reviewed by Mani.
2008-10-30 19:57:37 +00:00
4c38e5820a
When running vstool from develop.py, use the correct build type.
2008-10-30 18:53:38 +00:00
5243bafa57
force dos drive letters to be uppercase. Patch from Alissa Sabre. vetted through release and cmake lists.
2008-10-28 16:10:16 +00:00
5f3875018e
svn merge -r99056:99248 svn+ssh://svn.lindenlab.com/svn/linden/branches/andrew/gcc-4-003-for-merge
2008-10-10 16:04:02 +00:00
7920b59c9c
DEV-16938: use per-build-type build trees on Linux
2008-09-16 21:59:48 +00:00
07b856b7a4
Revert r96619 for now
2008-09-15 16:27:28 +00:00
53869a091c
DEV-18419 / Allow develop.py to be run from outside source tree
...
Whatever directory develop.py is run from, it will create the build
trees there.
Reviewed by Mani.
2008-09-12 23:56:45 +00:00
642cdd9572
svn merge -r96049:96026 -r95956:95931 -r95867:95775 svn+ssh://svn/svn/linden/release
...
Reverting my changes to the package target. It subtly broke the windows build in a way I didn't want to try to fix in release. Will fix in another branch.
2008-09-11 16:32:58 +00:00
e728263717
Use correct CMake names for boolean values.
2008-09-05 23:05:30 +00:00
1493a21262
svn merge -r95837:95841
...
svn+ssh://svn.lindenlab.com/svn/linden/branches/package-target-not-optional
--> release
Always add the package target, but do not include it when selecting
"Build Solution". Reviewed by james.
2008-09-05 17:11:59 +00:00
0e05ef68f9
Added help text for -DSERVER:BOOL=FALSE and -DPACKAGE:BOOL=TRUE options. No actual code changes. Reviewed with Kelly.
2008-09-03 18:08:12 +00:00
ac4766d435
Revert last change to develop.py because it breaks manually passing -DPACKAGE:BOOL=ON on the command line.
...
Merging revisions 95284-95283 of svn+ssh://svn.lindenlab.com/svn/linden/release into E:\release, respecting ancestry
2008-08-28 18:01:27 +00:00
9dfb138517
DEV-19836 Add --package and --viewer-only options to develop.py. Ported from maint-viewer. OK by CG.
...
Merging revisions 95145-95146,95281-95282 of svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-viewer/maint-viewer-10 into E:\release, respecting ancestry
2008-08-28 16:54:47 +00:00
3b3e122489
DEV-16182 / Improve error message if subcommand option unrecognised
...
Self-reviewed.
2008-08-04 22:33:28 +00:00
81443ef2aa
Added -N | --no-distcc option to develop.py to prevent use of distcc in the generated makefiles
2008-07-10 02:58:58 +00:00
916f9af25c
"mac cmake build should not be universal by default" changes. Reviewed by bos.
2008-06-16 09:21:51 +00:00
7bab07aedc
comment out the "simple" cases - it is never as simple as that.
2008-06-12 21:48:58 +00:00
a7d9a543e5
Changed the cygwin to windows path conversion to use 'cygpath -w'
2008-06-06 19:05:34 +00:00
2f26e1ef71
make it work on cygwin again. also fixed a bad parameter.
2008-06-06 17:42:44 +00:00
84fe582c1e
Don't add a package target on Windows or OS X by default.
...
This improves build times, since most devs don't need to package stuff.
Reviewed by that fine specimen of reviewerhood, Palange.
2008-06-05 23:56:32 +00:00
0e04707054
Autodetect an installed version of Visual Studio.
...
Reviewed by Palange.
2008-06-05 20:02:54 +00:00
9db949eec3
svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge
...
dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers
2008-06-02 21:14:31 +00:00
brad kittenbrink