summaryrefslogtreecommitdiff
path: root/indra/develop.py
AgeCommit message (Collapse)Author
2009-09-01Merged login-api with viewer-2.0.0-3 up through r132290.brad kittenbrink
2009-09-01Fix syntax error introduced by your's truely into develop.pyChristian Goetze
2009-09-01Add retry logic on certain exit codesChristian Goetze
2009-08-27Merged latest login-api with latest viewer-2.0.0-3 up through plugin-api-05 ↵brad kittenbrink
merge (r131929). Some minor post-merge cleanups still required.
2009-08-27svn merge -r 129841:129910 ↵Monroe Williams
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910 svn merge -r 129913:131718 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05 Some branch shenannigans in the pluginapi_05 branch caused this to become a two-part merge.
2009-07-30Merged in viewer-2.0.0-3 changes up through r129050. Boost got clobbered so ↵brad kittenbrink
I'll need to rebuild that, plus a couple other minor clenaups.
2009-07-24Merge in disabling of universal builds.Brad Kittenbrink
PPC is now oficially deprecated. svn merge -r 127807:128098 svn+ssh://svn.lindenlab.com/svn/linden/branches/brad/killppc-1
2009-07-161st attempt at disabling ppc build on macs.brad kittenbrink
2009-06-25Merge with SVN login-api-3 branchBryan O'Sullivan
2009-06-24Fix Mac BuildChristian Goetze
2009-06-19result of "svn merge -r123757:124890 ↵Paul Oppenheim
svn+ssh://svn.lindenlab.com/svn/linden/branches/improve-unit-testing/iface-04" for QAR-1496
2009-06-03Remove -parallelizeTargets from xcodebuild invocation, it seems to not work ↵Christian Goetze
well enough
2009-05-21Put the os.environ["DISTCC"] = ... call into main()Christian Goetze
2009-05-21Fix develop.py putenv bug, use new etch build-linux hosts for parabuild.Christian Goetze
2009-05-19Fix to develop.py to build on 64 bit windows.Mark Palange
Added March 2009 DirectX SDK to cmake config. Reviewed by brad
2009-05-14Set DISTCC_DIR to a location inside the source tree to avoid causing NFS ↵Christian Goetze
trouble with the default setting.
2009-05-14Max out distcc jobs to 12 in develop.pyChristian Goetze
2009-05-14There are 71 eniacs, not just 64Christian Goetze
2009-05-14Make develop.py work on eniacs the same way it works on stationsChristian Goetze
2009-04-30svn merge -r118008:118374 ↵Christian Goetze
svn+ssh://svn.lindenlab.com/svn/linden/branches/cg/viewer-etch-1 QAR-1459 etch builds enabled
2009-04-10Working around DEV-30401 by yanking the etch 32bit build code until the ↵Christian Goetze
viewer also builds on etch
2009-04-09Get 32-bit builds going on 64-bit Debian Etch.Bryan O'Sullivan
Reviewed by Brad.
2009-01-09DEV-16956 - Print a more useful error message if cmake is not foundBryan O'Sullivan
Reviewed by Poppy.
2009-01-08Result of svn merge -r107256:107258 ↵Aaron Brashears
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2008-12-23QAR-1142 merging 1.22 RC0-RC4 changes.Mark Palange
svn merge -c 106471 svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_1-22-106055_merge
2008-12-02QAR-1040 maint-viewer-11 + OpenAL combo mergemeAdam Moss
svn merge -c104451 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/openal-maint-viewer-11-combo-r104448
2008-11-21Merging the changes in viewer_1-22-0 (1.22 RC0) back into trunk, revs. ↵Mark Palange
101837 to 103519
2008-11-19QAR-1018 Lightweight Windows Setup App (windows-setup-3). svn merge ↵James Cook
-r102882:102883 svn+ssh://svn.lindenlab.com/svn/linden/branches/windows-setup/windows-setup-3-merge
2008-10-31Fix heinous traceback if commands are not foundBryan O'Sullivan
2008-10-30Windows build: only run vstool.exe once per build type.Bryan O'Sullivan
Reviewed by Mani.
2008-10-30When running vstool from develop.py, use the correct build type.Bryan O'Sullivan
2008-10-28force dos drive letters to be uppercase. Patch from Alissa Sabre. vetted ↵Aaron Brashears
through release and cmake lists.
2008-10-10svn merge -r99056:99248 ↵Andrew Meadows
svn+ssh://svn.lindenlab.com/svn/linden/branches/andrew/gcc-4-003-for-merge
2008-09-16DEV-16938: use per-build-type build trees on LinuxBryan O'Sullivan
2008-09-15Revert r96619 for nowBryan O'Sullivan
2008-09-12DEV-18419 / Allow develop.py to be run from outside source treeBryan O'Sullivan
Whatever directory develop.py is run from, it will create the build trees there. Reviewed by Mani.
2008-09-11svn merge -r96049:96026 -r95956:95931 -r95867:95775 ↵Kyle Ambroff
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-05Use correct CMake names for boolean values.Bryan O'Sullivan
2008-09-05svn merge -r95837:95841Kyle Ambroff
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-03Added help text for -DSERVER:BOOL=FALSE and -DPACKAGE:BOOL=TRUE options. No ↵James Cook
actual code changes. Reviewed with Kelly.
2008-08-28Revert last change to develop.py because it breaks manually passing ↵James Cook
-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-28DEV-19836 Add --package and --viewer-only options to develop.py. Ported ↵James Cook
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-04DEV-16182 / Improve error message if subcommand option unrecognisedBryan O'Sullivan
Self-reviewed.
2008-07-10Added -N | --no-distcc option to develop.py to prevent use of distcc in the ↵Kyle McKay
generated makefiles
2008-06-16"mac cmake build should not be universal by default" changes. Reviewed by bos.Paul Oppenheim
2008-06-12comment out the "simple" cases - it is never as simple as that.Christian Goetze
2008-06-06Changed the cygwin to windows path conversion to use 'cygpath -w'Mark Palange
2008-06-06make it work on cygwin again. also fixed a bad parameter.Aaron Brashears
2008-06-05Don't add a package target on Windows or OS X by default.Bryan O'Sullivan
This improves build times, since most devs don't need to package stuff. Reviewed by that fine specimen of reviewerhood, Palange.
2008-06-05Autodetect an installed version of Visual Studio.Bryan O'Sullivan
Reviewed by Palange.