Skip to content

Commit ece7fad

Browse files
alanmcgovernalanmcgovern
committed
Merge remote-tracking branch 'origin/master' into xs6
Conflicts: main/external/xwt version-checks
2 parents 4263095 + 53a1cba commit ece7fad

224 files changed

Lines changed: 4507 additions & 2083 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitmodules‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,6 @@
3333
path = main/external/fsharpbinding
3434
url = git://github.com/fsharp/fsharpbinding.git
3535
branch = master
36-
[submodule "main/external/sharpsvn-binary"]
37-
path = main/external/sharpsvn-binary
38-
url = git://github.com/mono/sharpsvn-binary.git
3936
[submodule "main/external/nuget-binary"]
4037
path = main/external/nuget-binary
4138
url = git://github.com/mono/nuget-binary.git

‎main/Main.sln‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1369,6 +1369,15 @@ Global
13691369
{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
13701370
{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
13711371
{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
1372+
{AC7D119C-980B-4712-8811-5368C14412D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1373+
{AC7D119C-980B-4712-8811-5368C14412D7}.DebugGnome|Any CPU.ActiveCfg = DebugGnome|Any CPU
1374+
{AC7D119C-980B-4712-8811-5368C14412D7}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
1375+
{AC7D119C-980B-4712-8811-5368C14412D7}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
1376+
{AC7D119C-980B-4712-8811-5368C14412D7}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
1377+
{AC7D119C-980B-4712-8811-5368C14412D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
1378+
{AC7D119C-980B-4712-8811-5368C14412D7}.ReleaseGnome|Any CPU.ActiveCfg = ReleaseGnome|Any CPU
1379+
{AC7D119C-980B-4712-8811-5368C14412D7}.ReleaseMac|Any CPU.ActiveCfg = ReleaseMac|Any CPU
1380+
{AC7D119C-980B-4712-8811-5368C14412D7}.ReleaseWin32|Any CPU.ActiveCfg = ReleaseWin32|Any CPU
13721381
{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
13731382
{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
13741383
{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

‎main/build/MacOSX/Makefile.am‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
MAC_APP_DIR=MonoDevelop.app
22
APP_NAME=MonoDevelop
33
MACOS=$(MAC_APP_DIR)/Contents/MacOS
4-
MAC_APP_LIB_DIR=$(MACOS)/lib/monodevelop
5-
ADDINS=$(MACOS)/lib/monodevelop/AddIns
4+
LIB_DIR=$(MAC_APP_DIR)/Contents/Resources/lib
5+
MAC_APP_LIB_DIR=$(LIB_DIR)/monodevelop
6+
ADDINS=$(MAC_APP_LIB_DIR)/AddIns
67
EXTRAS=$(top_srcdir)/../extras
78
ARTIFACTS=$(top_srcdir)/../../artifacts
89
MD_CONFIGURE=$(top_srcdir)/../scripts/configure.sh
@@ -35,7 +36,7 @@ app: monostub
3536
@echo "Creating directories in app bundle"
3637
@echo ""
3738
mkdir -p $(MAC_APP_DIR)/Contents/{MacOS,Resources}
38-
mkdir -p $(MAC_APP_DIR)/Contents/MacOS/{lib,share}
39+
mkdir -p $(MAC_APP_DIR)/Contents/MacOS/share
3940
mkdir -p $(MAC_APP_LIB_DIR)
4041

4142
# @echo ""
@@ -62,9 +63,9 @@ app: monostub
6263
sed -e "s/@BUNDLE_VERSION@/$(BUNDLE_VERSION)/" -e "s/@ASSEMBLY_VERSION@/$(ASSEMBLY_VERSION)/" -e "s/@APP_NAME@/$(APP_NAME)/" -e "s|@RELEASE_ID@|$(PACKAGE_UPDATE_ID)|" Info.plist.in > $(MAC_APP_DIR)/Contents/Info.plist
6364
cp ../../theme-icons/Mac/*.icns $(MAC_APP_DIR)/Contents/Resources/
6465

65-
# copy monodevelop.pc and monodevelop-core-addins.pc to Contents/MacOS/lib/pkgconfig
66-
mkdir -p $(MACOS)/lib/pkgconfig
67-
cp ../../*.pc $(MACOS)/lib/pkgconfig
66+
# copy monodevelop.pc and monodevelop-core-addins.pc to Contents/Resources/lib/pkgconfig
67+
mkdir -p $(LIB_DIR)/pkgconfig
68+
cp ../../*.pc $(LIB_DIR)/pkgconfig
6869

6970
# Copy main/monodevelop.xml to MonoDevelop.app/Contents/MacOS/share/mime/packages
7071
mkdir -p $(MACOS)/share/{applications,mime,icons,locale,man}
@@ -92,13 +93,13 @@ app: monostub
9293
@echo "Removing unneeded files"
9394
@echo ""
9495

95-
rm -rf $(MACOS)/lib/monodevelop/bin/UnitTests.dll* \
96-
$(MACOS)/lib/monodevelop/bin/TestResult.xml \
97-
$(MACOS)/lib/monodevelop/bin/addin-db* \
98-
$(MACOS)/lib/monodevelop/bin/local \
99-
$(MACOS)/lib/monodevelop/bin/repository-cache* \
100-
$(MACOS)/lib/monodevelop/bin/addins-setup.config \
101-
$(MACOS)/lib/monodevelop/AddIns/MonoDevelop.TextTemplating/Mono.TextTemplating.Tests*
96+
rm -rf $(MAC_APP_LIB_DIR)/bin/UnitTests.dll* \
97+
$(MAC_APP_LIB_DIR)/bin/TestResult.xml \
98+
$(MAC_APP_LIB_DIR)/bin/addin-db* \
99+
$(MAC_APP_LIB_DIR)/bin/local \
100+
$(MAC_APP_LIB_DIR)/bin/repository-cache* \
101+
$(MAC_APP_LIB_DIR)/bin/addins-setup.config \
102+
$(MAC_APP_LIB_DIR)/AddIns/MonoDevelop.TextTemplating/Mono.TextTemplating.Tests*
102103

103104
# add extras known to work on Mac, if they exist
104105
@echo ""
@@ -118,7 +119,7 @@ app: monostub
118119
@echo "Copying binary artifacts into app bundle"
119120
@echo ""
120121

121-
mkdir -p $(MACOS)/lib/pkgconfig
122+
mkdir -p $(LIB_DIR)/pkgconfig
122123
mkdir -p $(MACOS)/MonoDoc.app/
123124
test ! -d $(ARTIFACTS)/MonoDoc.app || cp -pR $(ARTIFACTS)/MonoDoc.app/* $(MACOS)/MonoDoc.app/
124125

@@ -129,13 +130,13 @@ app: monostub
129130
@echo "Updating build information"
130131
@echo ""
131132

132-
$(MD_CONFIGURE) gen-buildinfo "$(MACOS)/lib/monodevelop/bin"
133+
$(MD_CONFIGURE) gen-buildinfo "$(MAC_APP_LIB_DIR)/bin"
133134

134135
# touch the directory so that update dependencies work
135136
touch MonoDevelop.app
136137

137138
@echo ""
138-
@cat "$(MACOS)/lib/monodevelop/bin/buildinfo"
139+
@cat "$(MAC_APP_LIB_DIR)/bin/buildinfo"
139140
@if test -f missing-stuff; then echo ""; echo "Missing stuff:"; cat missing-stuff; fi
140141
@echo ""
141142
@rm -f missing-stuff

‎main/build/MacOSX/make-dmg-bundle.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ rm -f "$DMG_FILE.master"
3434

3535
# Compute an approximated image size in MB, and bloat by 1MB
3636
image_size=$(du -ck "$DMG_APP" | tail -n1 | cut -f1)
37-
image_size=$((($image_size + 2000) / 1000))
37+
image_size=$((($image_size + 40000) / 1000))
3838

3939
echo "Creating disk image (${image_size}MB)..."
4040
hdiutil create "$DMG_FILE" -megabytes $image_size -volname "$VOLUME_NAME" -fs HFS+ -quiet || exit $?

‎main/build/MacOSX/monostub.m‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@
263263
}
264264

265265
static void
266-
update_environment (const char *macosDir, const char *app)
266+
update_environment (const char *resourcesDir, const char *app)
267267
{
268268
char *value, *v1, *v2;
269269
char *variable;
@@ -279,8 +279,8 @@
279279
push_env ("PKG_CONFIG_PATH", "/Library/Frameworks/Mono.framework/External/pkgconfig");
280280

281281
/* Enable the use of stuff bundled into the app bundle */
282-
if ((v2 = str_append (macosDir, "/share/pkgconfig"))) {
283-
if ((v1 = str_append (macosDir, "/lib/pkgconfig:"))) {
282+
if ((v2 = str_append (resourcesDir, "/share/pkgconfig"))) {
283+
if ((v1 = str_append (resourcesDir, "/lib/pkgconfig:"))) {
284284
if ((value = str_append (v1, v2))) {
285285
push_env ("PKG_CONFIG_PATH", value);
286286
free (value);
@@ -292,15 +292,15 @@
292292
free (v2);
293293
}
294294

295-
if ((value = str_append (macosDir, "/lib"))) {
295+
if ((value = str_append (resourcesDir, "/lib"))) {
296296
push_env ("DYLD_FALLBACK_LIBRARY_PATH", value);
297297
free (value);
298298
}
299299

300-
push_env ("MONO_GAC_PREFIX", macosDir);
300+
push_env ("MONO_GAC_PREFIX", resourcesDir);
301301

302-
if ((value = str_append (macosDir, "/bin"))) {
303-
push_env ("PATH", macosDir);
302+
if ((value = str_append (resourcesDir, "/../MacOS"))) {
303+
push_env ("PATH", resourcesDir);
304304
free (value);
305305
}
306306

@@ -360,7 +360,7 @@
360360
int main (int argc, char **argv)
361361
{
362362
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
363-
NSString *binDir = [[NSString alloc] initWithUTF8String: "Contents/MacOS/lib/monodevelop/bin"];
363+
NSString *binDir = [[NSString alloc] initWithUTF8String: "Contents/Resources/lib/monodevelop/bin"];
364364
NSString *appDir = [[NSBundle mainBundle] bundlePath];
365365
// can be overridden with plist string MonoMinVersion
366366
NSString *req_mono_version = @"3.0.7";
@@ -390,7 +390,7 @@ int main (int argc, char **argv)
390390
basename++;
391391

392392
if (is_launcher (basename)) {
393-
update_environment ([[appDir stringByAppendingPathComponent:@"Contents/MacOS"] UTF8String], basename);
393+
update_environment ([[appDir stringByAppendingPathComponent:@"Contents/Resources"] UTF8String], basename);
394394
[pool drain];
395395

396396
return execv (argv[0], argv);

‎main/external/debugger-libs‎

‎main/external/fsharpbinding‎

Submodule fsharpbinding updated from 9ecaf6f to b764a98

‎main/external/mono-addins‎

‎main/external/nrefactory‎

Submodule nrefactory updated 83 files

‎main/external/nuget-binary‎

Submodule nuget-binary updated 2 files

0 commit comments

Comments
 (0)