Fix lining sources into the app bundle on Mac builds. Add a rule to i…

…gnore

Cadence-only ("glue") build directories.  Except that this rule seems to
conflict with the rule to recognise installer files.  If anyone can fix this,
please do!

.gitignore

@@ -51,6 +51,9 @@ platforms/unix/config/autom4te.cache/
 !editnewspeakinstall.sh
 !/build.linux32ARM/asasm
 
+# Ignore special Cadence-only build directories
+/build*/glue*
+
 # Track installer directories
 !installer
 # but ignore these files (derived from `grep installer .gitignore.orig`)

build.macos32x86/common/Makefile.app

@@ -61,6 +61,8 @@ SOURCES:=./$(SOURCEFILE)
 endif
 ifneq ($(APPSOURCE),)
 SOURCES:=$(SOURCES) $(APP)/Contents/Resources/$(APPSOURCE)
+$(APP)/Contents/Resources/$(APPSOURCE): $(SOURCESDIR)/$(APPSOURCE)
+	test -f $@ || ln $(SOURCESDIR)/$(notdir $@) $@
 endif
 
 

build.macos32x86/common/Makefile.sources

@@ -7,7 +7,7 @@ $(SOURCESDIR):
 	mkdir -p $(SOURCESDIR)
 
 %.sources: $(SOURCESDIR) $(SOURCESDIR)/%.sources
-	test -f $(notdir $@) || ln $(SOURCESDIR)/$@ .
+	test -f $@ || ln $(SOURCESDIR)/$(notdir $@) $@
 
 $(SOURCESDIR)/PharoV50.sources: 
 	curl http://files.pharo.org/get-files/50/sources.zip -o $@.zip

build.macos64x64/common/Makefile.app

@@ -61,6 +61,8 @@ SOURCES:=./$(SOURCEFILE)
 endif
 ifneq ($(APPSOURCE),)
 SOURCES:=$(SOURCES) $(APP)/Contents/Resources/$(APPSOURCE)
+$(APP)/Contents/Resources/$(APPSOURCE): $(SOURCESDIR)/$(APPSOURCE)
+	test -f $@ || ln $(SOURCESDIR)/$(notdir $@) $@
 endif
 
 

build.macos64x64/common/Makefile.sources

@@ -7,7 +7,7 @@ $(SOURCESDIR):
 	mkdir -p $(SOURCESDIR)
 
 %.sources: $(SOURCESDIR) $(SOURCESDIR)/%.sources
-	test -f $(notdir $@) || ln $(SOURCESDIR)/$@ .
+	test -f $@ || ln $(SOURCESDIR)/$(notdir $@) $@
 
 $(SOURCESDIR)/PharoV50.sources: 
 	curl http://files.pharo.org/get-files/50/sources.zip -o $@.zip