From 9265ecb4d6c573824a6e45367afc13c63092af37 Mon Sep 17 00:00:00 2001
From: DanyLE <xsang.le@gmail.com>
Date: Wed, 16 Mar 2022 00:02:31 +0100
Subject: [PATCH] add more classes to base image

---
 bin/diya  |  2 +-
 export.st | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/bin/diya b/bin/diya
index 46f1ec5..2f84be6 100755
--- a/bin/diya
+++ b/bin/diya
@@ -44,7 +44,7 @@ sdk()
         build "$ARCH"
         [ ! -e  "$W/../$ARCH/builder/pharo-ui" ] && echo "Unable to init SDK" && exit 1
     fi
-    "$W/../$ARCH/builder/pharo-ui" "$W/../$ARCH/builder/Pharo.image"
+    "$W/../$ARCH/builder/pharo-ui" "$W/../$ARCH/builder/Pharo.image" &
 }
 
 run()
diff --git a/export.st b/export.st
index 462374e..9867c81 100644
--- a/export.st
+++ b/export.st
@@ -46,6 +46,7 @@ packages := #(
 	'System-Localization' 
 	'STON-Core'
 	'Colors'
+	'Graphics-Primitives'
 	'Graphics-Files'
 	'Diya'
 ).
@@ -61,6 +62,9 @@ ignoresClasses := {
 	AthensCairoSDLSurface.
 	SourceFileArray.
 	GlyphForm.
+	ManifestGraphicsPrimitives.
+	EllipseMidpointTracer.
+	GrafPort
 }.
 "remove some unused meothods"
 Form class 
@@ -79,7 +83,7 @@ packages do:[:name | |pkg trait classes extensionMethods|
 	pkg := RPackageOrganizer default packageNamed: name asSymbol.
 	traits := (pkg definedClasses select: #isTrait) do: [ :e | core traits add:(HETrait for: e) ].
 	(pkg definedClasses reject: #isTrait) do: [ :e |
-		(ignoresClasses includes:e superclass) ifFalse:[
+		(ignoresClasses includes:e) ifFalse:[
 			core addClass: (HEClass for: e) ].
 		].
 	pkg extensionMethods do: [ :e | 
@@ -115,11 +119,8 @@ core addClass: (HEClass for:OSWindowPlatformSpecificHandle);
 	addClass: (HEClass for:DisplayMedium);
 	addClass: (HEClass for:Form);
 	addClass: (HEClass for:ColorForm);
-	addClass: (HEClass for:Bitmap);
-	addClass: (HEClass for:BitBlt);
 	addClass: (HEClass for:ColorArray);
-	addClass: (HEClass for: AnimatedImageFrame);
-	addClass: (HEClass for: WarpBlt)
+	addClass: (HEClass for: AnimatedImageFrame)
 	.
 
 fileReference := (dest,'/',(pkgn replaceAll: Character space with: $-),'.hermes') asFileReference.