Fix the issue raised by Pablo Tesone for startup of the SecurityPlugin.

eliotmiranda · eliotmiranda · commit c79879b4b4bd · 2018-12-03T10:26:23.000-08:00
http://lists.squeakfoundation.org/pipermail/vm-dev/2018-December/029337.html Also eliminate the duplicate in platforms/iOS/plugins/SecurityPlugin, and change all iOS plugin Makefiles to use $(PLATDIR) instead of a hard-coded path that constrains the build directory hierarchy.
diff --git a/platforms/iOS/plugins/AioPlugin/Makefile b/platforms/iOS/plugins/AioPlugin/Makefile
@@ -1,5 +1,5 @@
-INCDIRS:=../../platforms/Cross/plugins/FilePlugin \
-         ../../platforms/Cross/plugins/SocketPlugin \
-         ../../platforms/unix/vm
+INCDIRS:=$(PLATDIR)/Cross/plugins/FilePlugin \
+         $(PLATDIR)/Cross/plugins/SocketPlugin \
+         $(PLATDIR)/unix/vm
 
 include ../common/Makefile.plugin
diff --git a/platforms/iOS/plugins/AsynchFilePlugin/Makefile b/platforms/iOS/plugins/AsynchFilePlugin/Makefile
@@ -1,5 +1,5 @@
-SRCDIRS:=../../platforms/unix/plugins/AsynchFilePlugin
-INCDIRS:=../../platforms/Cross/plugins/AsynchFilePlugin \
-         ../../platforms/unix/vm
+SRCDIRS:=$(PLATDIR)/unix/plugins/AsynchFilePlugin
+INCDIRS:=$(PLATDIR)/Cross/plugins/AsynchFilePlugin \
+         $(PLATDIR)/unix/vm
 
 include ../common/Makefile.plugin
diff --git a/platforms/iOS/plugins/B3DAcceleratorPlugin/Makefile b/platforms/iOS/plugins/B3DAcceleratorPlugin/Makefile
@@ -2,9 +2,9 @@
 # of Carbon code & is hence 32-bit only.  So include the Carbon frameworks.
 # Until this can be rewritten this implies no 64-bit OpenGL on Mac OS X :-(.
 
-INCDIRS:=../../platforms/Cross/plugins/FilePlugin \
-         ../../platforms/unix/vm
-INCDIRS:=../../platforms/unix/vm
+INCDIRS:=$(PLATDIR)/Cross/plugins/FilePlugin \
+         $(PLATDIR)/unix/vm
+INCDIRS:=$(PLATDIR)/unix/vm
 
 EXTRADYFLAGS=-Wl,-U,_getImageName,-U,_getSTWindow,-U,_setWindowChangedHook,-U,_warning \
 	-Wl,-U,_getMainWindowOpenGLContext,-U,_createOpenGLTextureLayerHandle,-U,_destroyOpenGLTextureLayerHandle,-U,_setOpenGLTextureLayerContent
diff --git a/platforms/iOS/plugins/FileAttributesPlugin/Makefile b/platforms/iOS/plugins/FileAttributesPlugin/Makefile
@@ -2,8 +2,8 @@
 # FileAttributesPlugin uses sq2uxPath() and ux2sqPath(), provided by sqUnixCharConv.h
 #
 #
-SRCDIRS:=../../platforms/unix/vm ../../platforms/unix/plugins/FileAttributesPlugin
-INCDIRS:=../../platforms/unix/vm ../../platforms/unix/plugins/FileAttributesPlugin
+SRCDIRS:=$(PLATDIR)/unix/vm $(PLATDIR)/unix/plugins/FileAttributesPlugin
+INCDIRS:=$(PLATDIR)/unix/vm $(PLATDIR)/unix/plugins/FileAttributesPlugin
 LIBSRC:=FileAttributesPlugin.c sqUnixCharConv.c faSupport.c faCommon.c
 
 include ../common/Makefile.plugin
diff --git a/platforms/iOS/plugins/FileCopyPlugin/Makefile b/platforms/iOS/plugins/FileCopyPlugin/Makefile
@@ -1,5 +1,5 @@
-SRCDIRS:=../../platforms/unix/plugins/FileCopyPlugin \
-		 ../../platforms/unix/vm
+SRCDIRS:=$(PLATDIR)/unix/plugins/FileCopyPlugin \
+		 $(PLATDIR)/unix/vm
 
 LIBSRC:=FileCopyPlugin.c sqUnixFileCopyPlugin.c sqUnixCharConv.c
 
diff --git a/platforms/iOS/plugins/FilePlugin/Makefile b/platforms/iOS/plugins/FilePlugin/Makefile
@@ -1,3 +1,3 @@
-INCDIRS:=../../platforms/minheadless/unix
+INCDIRS:=$(PLATDIR)/minheadless/unix
 
 include ../common/Makefile.plugin
diff --git a/platforms/iOS/plugins/Mpeg3Plugin/Makefile b/platforms/iOS/plugins/Mpeg3Plugin/Makefile
@@ -1,6 +1,6 @@
-INCDIRS:=../../platforms/Cross/plugins/Mpeg3Plugin/libmpeg \
-         ../../platforms/Cross/plugins/Mpeg3Plugin/libmpeg/audio \
-         ../../platforms/Cross/plugins/Mpeg3Plugin/libmpeg/video
+INCDIRS:=$(PLATDIR)/Cross/plugins/Mpeg3Plugin/libmpeg \
+         $(PLATDIR)/Cross/plugins/Mpeg3Plugin/libmpeg/audio \
+         $(PLATDIR)/Cross/plugins/Mpeg3Plugin/libmpeg/video
 
 SRCDIRS:=$(INCDIRS)
 EXCLUDESRC:=%/dump.c %/dump2.c %/mpeg3toc.c %/mpeg3cat.c %/testaudio.c %/udump.c %/worksheet.c %/test.c
diff --git a/platforms/iOS/plugins/ObjectiveCPlugin/Makefile b/platforms/iOS/plugins/ObjectiveCPlugin/Makefile
@@ -1,7 +1,7 @@
 EXTRALIBS:=-undefined dynamic_lookup -framework Foundation
 CFLAGS:=-x objective-c
-INCDIRS:=../../platforms/iOS/plugins/SqueakObjectiveC
-SRCDIRS:=../../platforms/iOS/plugins/SqueakObjectiveC
+INCDIRS:=$(PLATDIR)/iOS/plugins/SqueakObjectiveC
+SRCDIRS:=$(PLATDIR)/iOS/plugins/SqueakObjectiveC
 LIBSRC:=squeakProxy.m squeakSUnitTester.m
 
-include ../common/Makefile.plugin
+include ../common/Makefile.plugin
diff --git a/platforms/iOS/plugins/SecurityPlugin/Makefile b/platforms/iOS/plugins/SecurityPlugin/Makefile
@@ -1,3 +1,5 @@
-INCDIRS:=../../platforms/Cross/plugins/FilePlugin
+SRCDIRS:=$(PLATDIR)/unix/plugins/SecurityPlugin
+INCDIRS:=$(PLATDIR)/Cross/plugins/FilePlugin $(PLATDIR)/Cross/plugins/SecurityPlugin
+LIBSRC:=SecurityPlugin.c sqUnixSecurity.c
 
 include ../common/Makefile.plugin
diff --git a/platforms/iOS/plugins/SecurityPlugin/sqUnixSecurity.c b/platforms/iOS/plugins/SecurityPlugin/sqUnixSecurity.c
diff --git a/platforms/iOS/plugins/SerialPlugin/Makefile b/platforms/iOS/plugins/SerialPlugin/Makefile
@@ -1,6 +1,6 @@
 #EXTRALIBS:=-undefined dynamic_lookup
-SRCDIRS:=../../platforms/unix/plugins/SerialPlugin
-INCDIRS:=../../platforms/Cross/plugins/SerialPlugin
+SRCDIRS:=$(PLATDIR)/unix/plugins/SerialPlugin
+INCDIRS:=$(PLATDIR)/Cross/plugins/SerialPlugin
 LIBSRC:=SerialPlugin.c sqUnixSerial.c
 
 include ../common/Makefile.plugin
diff --git a/platforms/iOS/plugins/SocketPlugin/Makefile b/platforms/iOS/plugins/SocketPlugin/Makefile
@@ -1,6 +1,6 @@
-SRCDIRS:=../../platforms/unix/plugins/SocketPlugin
-INCDIRS:=../../platforms/Cross/plugins/SocketPlugin \
-         ../../platforms/unix/vm
+SRCDIRS:=$(PLATDIR)/unix/plugins/SocketPlugin
+INCDIRS:=$(PLATDIR)/Cross/plugins/SocketPlugin \
+         $(PLATDIR)/unix/vm
 LIBSRC:= SocketPlugin.c sqUnixSocket.c
 
 include ../common/Makefile.plugin
diff --git a/platforms/iOS/plugins/SoundPlugin/Makefile b/platforms/iOS/plugins/SoundPlugin/Makefile
@@ -1,3 +1,3 @@
-INCDIRS:=../../platforms/iOS/vm/Common/Classes
+INCDIRS:=$(PLATDIR)/iOS/vm/Common/Classes
 
 include ../common/Makefile.plugin
diff --git a/platforms/iOS/plugins/UnixOSProcessPlugin/Makefile b/platforms/iOS/plugins/UnixOSProcessPlugin/Makefile
@@ -1,6 +1,6 @@
-INCDIRS:=../../platforms/Cross/plugins/FilePlugin \
-         ../../platforms/Cross/plugins/SocketPlugin \
-         ../../platforms/unix/vm
+INCDIRS:=$(PLATDIR)/Cross/plugins/FilePlugin \
+         $(PLATDIR)/Cross/plugins/SocketPlugin \
+         $(PLATDIR)/unix/vm
 
 EXTRALIBS:=-undefined dynamic_lookup
 
diff --git a/platforms/unix/plugins/SecurityPlugin/sqUnixSecurity.c b/platforms/unix/plugins/SecurityPlugin/sqUnixSecurity.c

Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@`
`2`	`2`	`# FileAttributesPlugin uses sq2uxPath() and ux2sqPath(), provided by sqUnixCharConv.h`
`3`	`3`	`#`
`4`	`4`	`#`
`5`		`-SRCDIRS:=../../platforms/unix/vm ../../platforms/unix/plugins/FileAttributesPlugin`
`6`		`-INCDIRS:=../../platforms/unix/vm ../../platforms/unix/plugins/FileAttributesPlugin`
	`5`	`+SRCDIRS:=$(PLATDIR)/unix/vm $(PLATDIR)/unix/plugins/FileAttributesPlugin`
	`6`	`+INCDIRS:=$(PLATDIR)/unix/vm $(PLATDIR)/unix/plugins/FileAttributesPlugin`
`7`	`7`	`LIBSRC:=FileAttributesPlugin.c sqUnixCharConv.c faSupport.c faCommon.c`
`8`	`8`
`9`	`9`	`include ../common/Makefile.plugin`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`-INCDIRS:=../../platforms/minheadless/unix`
	`1`	`+INCDIRS:=$(PLATDIR)/minheadless/unix`
`2`	`2`
`3`	`3`	`include ../common/Makefile.plugin`