[Vm-dev] [commit][3611] Enlightenment arrives in tiny scintillae.
commits at squeakvm.org
commits at squeakvm.org
Tue Feb 16 02:24:51 UTC 2016
Revision: 3611
Author: eliot
Date: 2016-02-15 18:24:48 -0800 (Mon, 15 Feb 2016)
Log Message:
-----------
Enlightenment arrives in tiny scintillae. Nuke eitheror in favour of
$(firstword $(realpath ...
Modified Paths:
--------------
branches/Cog/build.macos32x86/common/Makefile.vm
branches/Cog/build.macos64x64/common/Makefile.vm
branches/Cog/build.win32x86/common/Makefile
Modified: branches/Cog/build.macos32x86/common/Makefile.vm
===================================================================
--- branches/Cog/build.macos32x86/common/Makefile.vm 2016-02-16 02:09:44 UTC (rev 3610)
+++ branches/Cog/build.macos32x86/common/Makefile.vm 2016-02-16 02:24:48 UTC (rev 3611)
@@ -42,7 +42,6 @@
BLDDIR:= $(BUILD)
OBJDIR:= $(BLDDIR)/vm
-# N.B. PLATDIR *must* be a relative path, see -f../../$(shell test -f ...) below
PLATDIR:=../../platforms
CROSSDIR:=$(PLATDIR)/Cross/vm
OSXDIR:=$(PLATDIR)/iOS/vm/OSX
@@ -206,7 +205,8 @@
#
.PHONY: $(OBJDIR)/%.lib $(OBJDIR)/%.bundle
-plugin-makefile = $(shell test -f $(OSXPLUGINSDIR)/$(1)/Makefile && echo $(OSXPLUGINSDIR)/$(1)/Makefile || echo ../common/Makefile.plugin)
+#plugin-makefile = $(shell test -f $(OSXPLUGINSDIR)/$(1)/Makefile && echo $(OSXPLUGINSDIR)/$(1)/Makefile || echo ../common/Makefile.plugin)
+plugin-makefile = $(realpath $(OSXPLUGINSDIR)/$(1)/Makefile ../common/Makefile.plugin)
# Internal plugin. Build as lib then link in lib
# Check for Makefile in iOS plugins directory otherwise use default Makefile
Modified: branches/Cog/build.macos64x64/common/Makefile.vm
===================================================================
--- branches/Cog/build.macos64x64/common/Makefile.vm 2016-02-16 02:09:44 UTC (rev 3610)
+++ branches/Cog/build.macos64x64/common/Makefile.vm 2016-02-16 02:24:48 UTC (rev 3611)
@@ -42,7 +42,6 @@
BLDDIR:= $(BUILD)
OBJDIR:= $(BLDDIR)/vm
-# N.B. PLATDIR *must* be a relative path, see -f../../$(shell test -f ...) below
PLATDIR:=../../platforms
CROSSDIR:=$(PLATDIR)/Cross/vm
OSXDIR:=$(PLATDIR)/iOS/vm/OSX
@@ -206,7 +205,8 @@
#
.PHONY: $(OBJDIR)/%.lib $(OBJDIR)/%.bundle
-plugin-makefile = $(shell test -f $(OSXPLUGINSDIR)/$(1)/Makefile && echo $(OSXPLUGINSDIR)/$(1)/Makefile || echo ../common/Makefile.plugin)
+#plugin-makefile = $(shell test -f $(OSXPLUGINSDIR)/$(1)/Makefile && echo $(OSXPLUGINSDIR)/$(1)/Makefile || echo ../common/Makefile.plugin)
+plugin-makefile = $(realpath $(OSXPLUGINSDIR)/$(1)/Makefile ../common/Makefile.plugin)
# Internal plugin. Build as lib then link in lib
# Check for Makefile in iOS plugins directory otherwise use default Makefile
Modified: branches/Cog/build.win32x86/common/Makefile
===================================================================
--- branches/Cog/build.win32x86/common/Makefile 2016-02-16 02:09:44 UTC (rev 3610)
+++ branches/Cog/build.win32x86/common/Makefile 2016-02-16 02:24:48 UTC (rev 3611)
@@ -44,7 +44,6 @@
PLUGINSRCDIR:= ../../src
OBJDIR:= $(BUILD)/vm
-# N.B. PLATDIR *must* be a relative path, see -f../../$(shell ./eitheror ... below
PLATDIR:=../../platforms
CROSSDIR:=$(PLATDIR)/Cross/vm
WIN32DIR:=$(PLATDIR)/win32/vm
@@ -102,7 +101,7 @@
ETOBJ:= $(OBJDIR)/etext.o
-.PRECIOUS: eitheror.exe mkNamedPrims.exe
+.PRECIOUS: mkNamedPrims.exe
#############################################################################
# DirectX definitions
@@ -219,27 +218,27 @@
$(MAKE) -f $(MAKEFILE_LIST) CONFIGURATION=debug THREADING=single $(@,debug=) default
# Do make init to allow make -n to function.
-init: $(OBJDIR) eitheror.exe mkNamedPrims.exe
+init: $(OBJDIR) mkNamedPrims.exe
cleanall: clean cleanmt cleanast cleanmtast cleandbg cleanmtdbg
clean:
- rm -rf sqNamedPrims.h eitheror.exe mkNamedPrims.exe build
+ rm -rf sqNamedPrims.h mkNamedPrims.exe build
cleanmt:
- rm -rf sqNamedPrims.h eitheror.exe mkNamedPrims.exe buildmt
+ rm -rf sqNamedPrims.h mkNamedPrims.exe buildmt
cleanast:
- rm -rf sqNamedPrims.h eitheror.exe mkNamedPrims.exe buildast
+ rm -rf sqNamedPrims.h mkNamedPrims.exe buildast
cleanmtast:
- rm -rf sqNamedPrims.h eitheror.exe mkNamedPrims.exe buildmtast
+ rm -rf sqNamedPrims.h mkNamedPrims.exe buildmtast
cleandbg:
- rm -rf sqNamedPrims.h eitheror.exe mkNamedPrims.exe builddbg
+ rm -rf sqNamedPrims.h mkNamedPrims.exe builddbg
cleanmtdbg:
- rm -rf sqNamedPrims.h eitheror.exe mkNamedPrims.exe buildmtdbg
+ rm -rf sqNamedPrims.h mkNamedPrims.exe buildmtdbg
nukelibs:
rm $(LIBS)
@@ -263,9 +262,6 @@
@echo VMOBJ=$(VMOBJ)
@echo -----------------------------------------------------
-eitheror.exe: $(WIN32UTILDIR)/eitheror.c
- $(CC) -o $@ -O1 -mconsole -mno-cygwin $<
-
mingw32ver.exe: $(WIN32UTILDIR)/mingw32ver.c
$(CC) -o $@ -O1 -mconsole -mno-cygwin $<
@@ -325,12 +321,12 @@
.PHONY: $(OBJDIR)/%.lib $(OBJDIR)/%.dll
# Check for Makefile in win32 plugins directory otherwise use default Makefile
-plugin-makefile = $(shell ./eitheror.exe \
+plugin-makefile = $(firstword $(realpath \
$(PLATDIR)/win32/plugins/$(*F)/Makefile.plugin \
- ../common/Makefile.plugin)
+ ../common/Makefile.plugin))
# Internal plugin. Build as lib then link in lib
-$(OBJDIR)/%.lib: eitheror.exe $(call plugin-makefile,$(*F))
+$(OBJDIR)/%.lib: $(call plugin-makefile,$(*F))
@-mkdir $(BUILD)/$(*F)
$(MAKE) $(MFLAGS) CONFIGURATION=$(CONFIGURATION) BUILD=$(BUILD) \
-f $(call plugin-makefile,$(*F)) \
@@ -339,7 +335,7 @@
$(OBJDIR)/$(*F).lib
# External plugin. Build as dll and copy to vm dir ($(OBJDIR)).
-$(OBJDIR)/%.dll: eitheror.exe $(call plugin-makefile,$(*F))
+$(OBJDIR)/%.dll: $(call plugin-makefile,$(*F))
@-mkdir $(BUILD)/$(*F)
$(MAKE) $(MFLAGS) CONFIGURATION=$(CONFIGURATION) BUILD=$(BUILD) \
-f $(call plugin-makefile,$(*F)) \
More information about the Vm-dev
mailing list