Commit Graph

77 Commits (master)

Author SHA1 Message Date
Melanie 2f52a3b124 When using FSAssets, the HGAssetService would still use AssetService.
This introduces a new HGAssetService config option named BackingService,
which defaults to the old behaviour, loading AssetService. It can, however,
be used to load FSAssets for HG assets, which eliminates numerous problems.
2019-07-13 13:33:34 +01:00
UbitUmarov 34da125a4d fix our name is OpenSimulator not OpenSim 2017-08-31 15:25:14 +01:00
UbitUmarov 3fe3471532 improve Prefer32bit configuration option 2017-08-31 15:17:42 +01:00
UbitUmarov a578df9589 CSharp targets name still wrong 2017-08-31 11:29:00 +01:00
UbitUmarov b9fc629bdf fix a whitecode bug, add missing files 2017-08-31 11:23:03 +01:00
UbitUmarov a30d8f8e64 fix a prebuild VS targets assembly name 2017-08-31 09:59:44 +01:00
UbitUmarov 46ead8dcb2 make option Prefer32bit default to false. Thanks Freaky Tech 2017-08-30 22:49:13 +01:00
UbitUmarov 41e8b9f91f update Prebuild with WhiteCore version 2017-08-30 22:24:07 +01:00
Melanie Thielker b16abc8166 Massive tab and trailing space cleanup 2017-01-05 19:07:37 +00:00
Melanie Thielker 28fb722612 CR safari. Remove gratuitious CRs in some files 2016-04-07 19:53:56 +02:00
Oren Hurvitz eaf99bf928 Changed to Unix line-endings in VS2010Target.cs
Resolves http://opensimulator.org/mantis/view.php?id=6951
2014-03-24 12:27:07 +01:00
Oren Hurvitz f5ae36d7e2 Updated Prebuild to support .NET 4.5
Resolves http://opensimulator.org/mantis/view.php?id=6951
2014-03-24 12:26:54 +01:00
Justin Clark-Casey (justincc) 90c6d2e50c Stop Prebuild from generating <copy> statements which unnecessarily copy files into bin/Debug or bin/Release
nant_0.91~alpha2+dfsg-3_all.deb in Ubuntu 12.04 and earlier actually ignored these due to a bug
However, nant 0.92~rc1+dfsg-2 in Ubuntu 12.10 fixes this bug (possibly https://github.com/nant/nant/pull/39).
Which makes nant time-consumingly copy these files when the aren't actually used.
Tested removal of <copy> on both nant 0.91 and nant 0.92
Will be submitting this patch to prebuild project for comment though I suspect there's nobody there to pay attention.
2012-11-14 02:25:07 +00:00
BlueWall f36fe45fa7 Add Copy task to Prebuild.exe (vsxxxx targets)
<Files>
    <Match pattern="*.cs" recurse="true"/>
    <Match pattern="../bin/MyConfig.xml" buildAction="Copy" recurse="false" destination="$(OutputPath)" />
  </Files>
2011-12-25 00:04:42 -05:00
Justin Clark-Casey (justincc) 91f59f246f also get "nant clean" to remove old .mdb from .exe and .dll 2011-08-30 23:20:54 +01:00
Justin Clark-Casey (justincc) 9e4153f16b Hack our copy of Prebuild to just delete the dlls and mdbs in Physics, so as to leave the new config file 2011-08-30 23:17:02 +01:00
John Hurliman a9acc6730d Removing .svn directories under Prebuild/ from source control 2010-09-11 18:26:59 -07:00
Diva Canto d5c7a8d28c All these files want to be committed. All white space junk. grr. 2010-09-10 21:18:23 -07:00
Diva Canto 51a5af93d0 White space junk. 2010-09-10 18:48:32 -07:00
Justin Clark-Casey (justincc) 7e65590a55 Update Prebuild.exe with Prebuild r323 + an existing OpenSim specific nant hack to correctly clean up chosen OpenSim exes and dlls in bin/ on a "nant clean"
Source code is included for reference.  This can go away again once Prebuild is updated with a more general mechanism for cleaning up files.
The Prebuild source code here can be built with nant, or regnerated for other tools using the prebuild at {root}/bin/Prebuild.exe
2010-09-11 01:13:08 +01:00
BlueWall 1e44ec84bd Build system upgrade:
Upgrading Prebuild.exe to correctly construct build solutions
	for crossplatform tools such as xbuild, monodevelop and nant.

	NOTE: Module prebuild files will need modification to work,
	as the prebuild must correctly define the reference path for
	all assemblies shipped in the OpenSimulator ./bin directory.
	These include assemblies such as XMLRPC.dll, OpenMetaverse.dll,
	Nini.dll, etc. . The entries should follow the form:

		<Reference name="Nini" path="../../../bin/"/>

	See the distributed prebuild.xml for further examples.

	Crossplatform tools: xbuild and monodevelop use the
	vs2008 OpenSim.sln and the .csproj files in each namespace.

	Changes to the Prebuild.exe are against svn 322 and are included
	in a patch attached to the mantis. And the dnpb source are
	available@ svn co https://dnpb.svn.sourceforge.net/svnroot/dnpb dnpb
	The patches are pending application by the dnpb team. After which,
	the un-modified upstream Prebuild.exe will work as expected.
2010-09-04 02:12:21 +01:00
John Hurliman 96d53f11e5 Added VS2010 support to Prebuild and created runprebuild2010.bat 2009-10-22 17:03:13 -07:00
John Hurliman f6cc20940f Taking the opportunity to delete unnecessary text files from the Prebuild folder (the license information is already in the appropriate place in the OpenSim distro) 2009-09-30 17:49:51 -07:00
Melanie 8274005029 Update prebuild once again 2009-08-06 22:55:50 +01:00
Melanie 01dd16d408 Add sorting to prebuild 2009-08-06 22:36:39 +01:00
Melanie Thielker 7d5b620e6b Thank you, mcortez, for a patch to prebuild to allow includes with wildcards.
Fixes Mantis #3860
2009-07-06 23:53:47 +00:00
lbsa71 d8b51cc3a8 * This should fix the 'Solution Folder' annoyance on express versions. 2009-02-23 10:38:25 +00:00
Jeff Ames 7d4846462b Update svn properties, add copyright headers, minor formatting cleanup. 2009-02-20 02:33:54 +00:00
lbsa71 06ece33bee * Okay, so finally got my head around this. Problem is that upstream Prebuild copied dlls promiscuously, and this led to the references being all mixed up (/bin dlls overwritten by different versions on every csc)
* Something that thus needs fixing is the fact that ProjectReferences has to be marked 
    <ProjectReference>
      <Private>False</Private>
    </ProjectReference>
but that is not configurable in the upstream Xml Schema. I've hardcoded it in our repo for now.
2009-02-19 18:01:33 +00:00
lbsa71 549c615e0e * reverted the revert of the revert. What can I say? I'm calling this a day, and will get back up on the horse tomorrow. 2009-02-19 14:54:21 +00:00
lbsa71 40d88ce905 * Reverted the revert, as it seems the problem was the 1.0.* in the separate projects. 2009-02-19 14:35:11 +00:00
lbsa71 e36c452d4e * Reverted Prebuild commit due to strange run-time errors. 2009-02-19 14:16:22 +00:00
lbsa71 dd9640cda8 === PREBUILD UPSTREAMS UPDATE : POTENTIAL BREAKAGE ===
* Applied upstreams changes to allow for auditing and debugging in our various environments.
* This should, in theory, bring back 'multiple ref dirs'.
* Temporarily Removed xmlns because prebuild-1.7 schema does not allow for multiple solutions per prebuild node (This will be a moot issue once the Prebuild node is moved out of prebuild.xml)
* Autotools target: Various minor fixes
* MonoDevelop Target : No changes.
* Nant Target: Various minor fixes, support for net-3.5 and mono-2.0/3.5 targets
* Sharpdevelop targets: No changes.
* VS Targets: Refactored into using VSGenericTarget, and supports 2.0-3.5
* XCode Target: No changes.

--- Regressions and outstanding issues ---
* The Solution is assigned a random Guid - will lead to unnecessary reloads and loss of user settings.

--- New features of Prebuild 2.0.4 ---
* (Better) support for Web, WinForms and Database Projects and build actions
* Conditional Framework Version compilation support (1.1, 2.0-3.5)
* ArrayList -> List<>, ICollection -> IList
  (this means Prebuild can generate 1.1 solutions, but can't itself be built under 1.1 - how very meta)
* Added <?include file="sub_prebuild.xml" ?> preprocessor directive.
2009-02-19 12:48:38 +00:00
lbsa71 55d89b73ed * fixed 'path' reference attribute for Nant and VS2008 targets. 2009-02-17 16:15:29 +00:00
lbsa71 87eff82b28 * Added resolving explicit .exe project names. This fixes mantis #2967 2009-01-13 10:06:53 +00:00
Jeff Ames ab749af130 Fix .mdb include in Prebuild. 2008-11-08 13:55:11 +00:00
lbsa71 07386b223d * Removed <if> in <fileset> in NAnt target introduced in 4045. Chi11ken should have a look at this. 2008-11-08 13:00:24 +00:00
lbsa71 c0d69d0ec7 * Rebuildt Prebuild.exe to fix vs2008 not creating Solution
* Wrapped solution streamwrites in using for great justice
2008-11-08 12:15:28 +00:00
Jeff Ames 2d7e0a4d4a Modify NAnt target in Prebuild to copy .mdb files to bin in debug configuration. (bug #55)
Use 'mono --debug OpenSim.exe' to get line number output on stack traces.
2008-03-31 06:45:54 +00:00
Jeff Ames e3ca113075 Add "warnings as errors" support for nant and monodevelop to Prebuild (though monodevelop may ignore this). 2008-03-25 07:49:31 +00:00
Jeff Ames 79209c4297 Merged changes in Prebuild trunk up to r258 into OpenSim's Prebuild.
Hopefully this should make merging upstream easier.
Building with NAnt should still work, but Visual Studio is untested.
2008-03-17 20:55:21 +00:00
Jeff Ames 28a07ed2e8 Backported MACOSX OS identifier into Prebuild. 2008-02-27 05:22:47 +00:00
Justin Clarke Casey 57cfd5e8d1 * Two (combined) patches from Dr Schofield (dirk husemann). Ta very much :)
* Patch 1 stops OpenSim.32BitLaunch.exe and ScriptEngines/Default.lsl being deleted on nant clean
* Patch 2 resolves a building problem with pCampBot
* This will require a prebuild rerun
2008-02-15 11:11:03 +00:00
Jeff Ames 20215c3d30 Rewrote svn properties handling script in python. Added more file types. 2008-01-26 10:34:49 +00:00
Jeff Ames 582d0a29d5 Set svn properties. 2008-01-26 04:26:12 +00:00
Jeff Ames 1a484fcabf Set svn:eol-style. 2007-12-28 08:56:44 +00:00
lbsa71 76255c4793 * removed comment 2007-12-20 11:38:13 +00:00
lbsa71 0770b0f5cb * Updated vs2008 target ProductVersion to "9.0.21022"
* Updated exe
2007-12-20 11:34:32 +00:00
lbsa71 ffc1428dff * Added prototypical VS2008 target 2007-12-20 11:30:56 +00:00
lbsa71 90611ebf8d * took a stab at #54 2007-12-04 13:43:11 +00:00