From d32aa83c496c98efb9d64c66d1602a22911e565b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marius=20D=C3=B6rbandt?= Date: Mon, 24 Jun 2024 12:28:58 +0200 Subject: [PATCH] Install Squot via Metacello inside .sar instead of bundling Squot with it --- .../class/classDependencies.st | 11 ----------- .../class/extensionMethodCategoryDependencies.st | 3 --- .../methodProperties.json | 3 +-- .../instance/addAssetLoaderClassToSar..st | 6 +----- .../instance/fileOutAssetLoaderClass.st | 16 ---------------- .../SquotAssetMapper.class/methodProperties.json | 3 +-- 6 files changed, 3 insertions(+), 39 deletions(-) delete mode 100644 src/Squot.package/GitStandaloneAssetLoader.class/class/classDependencies.st delete mode 100644 src/Squot.package/GitStandaloneAssetLoader.class/class/extensionMethodCategoryDependencies.st delete mode 100644 src/Squot.package/SquotAssetMapper.class/instance/fileOutAssetLoaderClass.st diff --git a/src/Squot.package/GitStandaloneAssetLoader.class/class/classDependencies.st b/src/Squot.package/GitStandaloneAssetLoader.class/class/classDependencies.st deleted file mode 100644 index 40427024a..000000000 --- a/src/Squot.package/GitStandaloneAssetLoader.class/class/classDependencies.st +++ /dev/null @@ -1,11 +0,0 @@ -dependencies -classDependencies - ^ (({ - self. - SquotPathUtilities. - SquotAnimation. - SquotPlaintext. - }, SquotAssetMapper allSubclasses) - gather: #withAllSuperclasses) - asSet - select: [:each | each package = self package] \ No newline at end of file diff --git a/src/Squot.package/GitStandaloneAssetLoader.class/class/extensionMethodCategoryDependencies.st b/src/Squot.package/GitStandaloneAssetLoader.class/class/extensionMethodCategoryDependencies.st deleted file mode 100644 index e1407ad31..000000000 --- a/src/Squot.package/GitStandaloneAssetLoader.class/class/extensionMethodCategoryDependencies.st +++ /dev/null @@ -1,3 +0,0 @@ -dependencies -extensionMethodCategoryDependencies - ^ {#'*Squot-Mapper-Sound'} \ No newline at end of file diff --git a/src/Squot.package/GitStandaloneAssetLoader.class/methodProperties.json b/src/Squot.package/GitStandaloneAssetLoader.class/methodProperties.json index 178854061..a1b032ad7 100644 --- a/src/Squot.package/GitStandaloneAssetLoader.class/methodProperties.json +++ b/src/Squot.package/GitStandaloneAssetLoader.class/methodProperties.json @@ -1,7 +1,6 @@ { "class" : { - "classDependencies" : "mad 1/11/2024 21:53", - "extensionMethodCategoryDependencies" : "mad 1/11/2024 22:45" }, + }, "instance" : { "assetAt:" : "mad 1/9/2024 20:26", "assetAt:put:" : "mad 1/9/2024 20:26", diff --git a/src/Squot.package/SquotAssetMapper.class/instance/addAssetLoaderClassToSar..st b/src/Squot.package/SquotAssetMapper.class/instance/addAssetLoaderClassToSar..st index e926394a5..0c31dd91e 100644 --- a/src/Squot.package/SquotAssetMapper.class/instance/addAssetLoaderClassToSar..st +++ b/src/Squot.package/SquotAssetMapper.class/instance/addAssetLoaderClassToSar..st @@ -1,7 +1,3 @@ sar addAssetLoaderClassToSar: aSarBuilder - | fileOutPath | - fileOutPath := self class package name, '.st'. - aSarBuilder - addString: self fileOutAssetLoaderClass at: fileOutPath; - addPreambleLine: ('self fileInMemberNamed: {1}.' format: {fileOutPath printString}). \ No newline at end of file + aSarBuilder addPreambleLine: 'Metacello new baseline: ''Squot''; repository: ''github://hpi-swa/Squot:mapper/src''; get; load.'. \ No newline at end of file diff --git a/src/Squot.package/SquotAssetMapper.class/instance/fileOutAssetLoaderClass.st b/src/Squot.package/SquotAssetMapper.class/instance/fileOutAssetLoaderClass.st deleted file mode 100644 index 190da5bab..000000000 --- a/src/Squot.package/SquotAssetMapper.class/instance/fileOutAssetLoaderClass.st +++ /dev/null @@ -1,16 +0,0 @@ -sar -fileOutAssetLoaderClass - ^ String streamContents: [:stream | | extensionCategories | - (GitStandaloneAssetLoader classDependencies - sorted: [:a :b | b inheritsFrom: a]) - do: [:each | each fileOutOn: stream]. - extensionCategories := GitStandaloneAssetLoader extensionMethodCategoryDependencies. - self class package externalClasses - select: [:each | each organization categories includesAnyOf: extensionCategories] - thenDo: [:class | - extensionCategories do: [:category | - class - fileOutCategory: category - on: stream - moveSource: false - toFile: 0]]] \ No newline at end of file diff --git a/src/Squot.package/SquotAssetMapper.class/methodProperties.json b/src/Squot.package/SquotAssetMapper.class/methodProperties.json index f59f99f61..3fcc23f6f 100644 --- a/src/Squot.package/SquotAssetMapper.class/methodProperties.json +++ b/src/Squot.package/SquotAssetMapper.class/methodProperties.json @@ -13,7 +13,7 @@ "validEncodings" : "mad 9/20/2023 18:41" }, "instance" : { "=" : "mad 9/20/2023 18:59", - "addAssetLoaderClassToSar:" : "mad 1/11/2024 22:36", + "addAssetLoaderClassToSar:" : "mad 6/24/2024 12:21", "addAssetLoaderFileLine:toSar:" : "mad 1/9/2024 18:38", "addAssetLoaderFileToSar:" : "mad 1/11/2024 22:28", "addToSar:" : "mad 1/11/2024 21:19", @@ -35,7 +35,6 @@ "encoding" : "mad 9/20/2023 18:39", "encoding:" : "mad 9/20/2023 18:43", "encodingName" : "mad 9/20/2023 19:02", - "fileOutAssetLoaderClass" : "mad 1/11/2024 22:26", "hash" : "mad 9/20/2023 18:59", "importPriority" : "mad 4/22/2024 16:43", "initialize" : "mad 9/20/2023 18:55",