diff options
| author | Michael Hutchinson <mhutchinson@novell.com> | 2009-12-12 02:56:57 +0300 |
|---|---|---|
| committer | Michael Hutchinson <mhutchinson@novell.com> | 2009-12-12 02:56:57 +0300 |
| commit | 20c2dade9155edd18d4d61274b89233579375352 (patch) | |
| tree | aa5d1395d4548504aa8e2e621576f98a018f3044 /main/build | |
| parent | a71b70a8daabd5747512807a2587f0336baf2fd1 (diff) | |
Backport 148140, 148167-148175 from trunk:
2009-12-11 Michael Hutchinson <mhutchinson@novell.com>
* MonoDevelop.AspNet/AspNetExecutionHandler.cs: Use "xsp1" not
"xsp", but include a fallback so that it still works without
wrapper scripts, as xsp1 is xsp.exe.
2009-12-11 Michael Hutchinson <mhutchinson@novell.com>
* MonoDevelop.Moonlight/MoonlightBuildExtension.cs: If the
framework package is not found, fall back to default version
string.
2009-12-11 Michael Hutchinson <mhutchinson@novell.com>
* MonoDevelop.Moonlight/MoonlightBuildExtension.cs: Fix logic
error.
2009-12-12 Lluis Sanchez Gual <lluis@novell.com>
* MonoDevelop.Ide.Gui.Dialogs/CommonAboutDialog.cs: Add Jakub
Steiner.
2009-12-11 Michael Hutchinson <mhutchinson@novell.com>
* MonoDevelop.Core.Assemblies/AssemblyContext.cs: Always set
the package name so that package name lookups work on
framework packages.
2009-12-11 Michael Hutchinson <mhutchinson@novell.com>
* MonoDevelop.Core.Assemblies/AssemblyContext.cs: Fix
framework package duplication for internal backend packages
too.
2009-12-11 Michael Hutchinson <mhutchinson@novell.com>
* MonoDevelop.Core.Assemblies/TargetRuntime.cs:
* MonoDevelop.Core.Assemblies/AssemblyContext.cs: If package
names are duplicated and one of them is a framework package,
remove the others.
* MonoDevelop.Core.Assemblies/MonoRuntimeInfo.cs: Remove
unneeded env vars.
2009-12-11 Michael Hutchinson <mhutchinson@novell.com>
* mdtool:
* monodevelop: Track Moonlight SDK env var change.
svn path=/branches/monodevelop/main/2.2/; revision=148177
Diffstat (limited to 'main/build')
| -rw-r--r-- | main/build/MacOSX/ChangeLog | 5 | ||||
| -rwxr-xr-x | main/build/MacOSX/mdtool | 4 | ||||
| -rwxr-xr-x | main/build/MacOSX/monodevelop | 4 |
3 files changed, 9 insertions, 4 deletions
diff --git a/main/build/MacOSX/ChangeLog b/main/build/MacOSX/ChangeLog index 6427a3d1fb..bc101b2d5c 100644 --- a/main/build/MacOSX/ChangeLog +++ b/main/build/MacOSX/ChangeLog @@ -1,3 +1,8 @@ +2009-12-11 Michael Hutchinson <mhutchinson@novell.com> + + * mdtool: + * monodevelop: Track Moonlight SDK env var change. + 2009-11-30 Michael Hutchinson <mhutchinson@novell.com> * Info.plist.in: Add file association for mdw files. diff --git a/main/build/MacOSX/mdtool b/main/build/MacOSX/mdtool index 0700a35d92..4dc8b1428e 100755 --- a/main/build/MacOSX/mdtool +++ b/main/build/MacOSX/mdtool @@ -33,8 +33,8 @@ fi #fi ## Moonlight SDK -if [ -d "$DIR/lib/MoonSDK" ]; then - export MOONLIGHT_2_SDK_PATH="$DIR/lib/MoonSDK" +if [ -d "$DIR/lib/moonlight" ]; then + export MOONLIGHT_SDK_PATH="$DIR/lib/moonlight" fi ### END MAC-SPECIFIC SETUP diff --git a/main/build/MacOSX/monodevelop b/main/build/MacOSX/monodevelop index 8066c61b34..458fdbef30 100755 --- a/main/build/MacOSX/monodevelop +++ b/main/build/MacOSX/monodevelop @@ -59,8 +59,8 @@ fi #fi ## Moonlight SDK -if [ -d "$DIR/lib/MoonSDK" ]; then - export MOONLIGHT_2_SDK_PATH="$DIR/lib/MoonSDK" +if [ -d "$DIR/lib/moonlight" ]; then + export MOONLIGHT_SDK_PATH="$DIR/lib/moonlight" fi _MD_LOG_FILE="${MD_LOG_FILE:-$HOME/Library/Logs/MonoDevelop/MonoDevelop.log}" |