cleanup

vdelachaux · Oct 2, 2024 · fce0c7b · fce0c7b
1 parent 8a415c2
commit fce0c7b
Show file tree

Hide file tree

Showing 18 changed files with 115 additions and 65 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -10,16 +10,20 @@ on:
 
 jobs:
   build:
-    name: "Build"
-    runs-on: windows-latest
+    name: "Build on ${{ matrix.os }}"
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ macos-latest, windows-latest ]
+    runs-on: ${{ matrix.os }}
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Build
       uses: 4d/build4d-action@main
       with:
         product-line: vcs
         version: vcs
         build: official
         token: ${{ secrets.DLTK }}
-        
+
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -0,0 +1,27 @@
+name: Release
+on: 
+  release:
+    types: [published]
+jobs:
+  publish:
+    name: Publish
+    runs-on: macos-latest
+    env:
+      GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+    permissions:
+      contents: write # for asset upload
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: BuildAndPackage
+        uses: 4d/build4d-action@main
+        with:
+            product-line: vcs
+            version: vcs
+            build: official
+            token: ${{ secrets.DLTK }}
+            actions: "build,pack,sign,archive"
+            sign-certificate: "Vincent de Lachaux (DYRKW64QA9)"
+      - name: Upload
+        run: |
+          gh release upload ${{github.event.release.tag_name}} build/4DPop-XLIFF-Pro.zip
diff --git a/Build/4DPop-XLIFF-Pro.dmg b/Build/4DPop-XLIFF-Pro.dmg
diff --git a/Build/4DPop-XLIFF-Pro.zip b/Build/4DPop-XLIFF-Pro.zip
diff --git a/Build/Components/4DPop XLIFF Pro.4dbase/4DPop XLIFF Pro.4DZ b/Build/Components/4DPop XLIFF Pro.4dbase/4DPop XLIFF Pro.4DZ
diff --git a/Build/Components/4DPop XLIFF Pro.4dbase/Info.plist b/Build/Components/4DPop XLIFF Pro.4dbase/Info.plist
@@ -8,19 +8,19 @@
     <key>CFBundleIdentifier</key>
     <string>com.4D.4DPop XLIFF Pro</string>
     <key>CFBundleGetInfoString</key>
-    <string>20R6</string>
+    <string>20R7</string>
     <key>CFBundleLongVersionString</key>
-    <string>20R6 (102)</string>
+    <string>20R7 (103)</string>
     <key>CFBundleName</key>
     <string>4DPop XLIFF Pro</string>
     <key>CFBundleDevelopmentRegion</key>
     <string>French</string>
     <key>CFBundleDisplayName</key>
     <string>4DPop XLIFF Pro</string>
     <key>CFBundleVersion</key>
-    <string>103</string>
+    <string>104</string>
     <key>CFBundleShortVersionString</key>
-    <string>20R6</string>
+    <string>20R7</string>
     <key>CFBundleExecutable</key>
     <string>4DPop XLIFF Pro</string>
   </dict>

diff --git a/Build/Components/4DPop XLIFF Pro.4dbase/Libraries/lib4d-arm64.dylib b/Build/Components/4DPop XLIFF Pro.4dbase/Libraries/lib4d-arm64.dylib
diff --git a/Build/Components/4DPop XLIFF Pro.4dbase/Resources/InfoPlist.strings b/Build/Components/4DPop XLIFF Pro.4dbase/Resources/InfoPlist.strings
diff --git a/Info.plist b/Info.plist
@@ -8,19 +8,19 @@
     <key>CFBundleIdentifier</key>
     <string>com.4D.4DPop XLIFF Pro</string>
     <key>CFBundleGetInfoString</key>
-    <string>20R6</string>
+    <string>20R7</string>
     <key>CFBundleLongVersionString</key>
-    <string>20R6 (102)</string>
+    <string>20R7 (103)</string>
     <key>CFBundleName</key>
     <string>4DPop XLIFF Pro</string>
     <key>CFBundleDevelopmentRegion</key>
     <string>French</string>
     <key>CFBundleDisplayName</key>
     <string>4DPop XLIFF Pro</string>
     <key>CFBundleVersion</key>
-    <string>103</string>
+    <string>104</string>
     <key>CFBundleShortVersionString</key>
-    <string>20R6</string>
+    <string>20R7</string>
     <key>CFBundleExecutable</key>
     <string>4DPop XLIFF Pro</string>
   </dict>

diff --git a/Project/4DPop XLIFF Pro.4DProject b/Project/4DPop XLIFF Pro.4DProject
@@ -1,5 +1,5 @@
 {
 	"$comment": "The project file let you override the location for most folders",
 	"compatibilityVersion": 2000,
-	"$4DPopAppMakerToolVersion": "20R6"
+	"$4DPopAppMakerToolVersion": "20R7"
 }
diff --git a/Project/Sources/Classes/formDelegate.4dm b/Project/Sources/Classes/formDelegate.4dm
@@ -47,8 +47,6 @@ Class constructor($param)
 
 	End for 
 
-	This:C1470._worker:=Null:C1517
-	This:C1470._callback:=Null:C1517
 	This:C1470._darkExtension:="_dark"
 	This:C1470.entryOrder:=[]
 
@@ -491,7 +489,7 @@ Function callWorker($method; $param; $param1; $paramN)
 	// .callWorker ( process : Integer ; method : Text ; param1, param2, …, paramN )
 	// ---------------------------------------------------------------------------------
 
-	C_VARIANT:C1683(${2})
+	_O_C_VARIANT:C1683(${2})
 
 	var $code : Text
 	var $i : Integer
@@ -692,7 +690,7 @@ Function callMe($method : Text; $param1; $paramN)
 .callMe ( method : Text ; param1, param2, …, paramN )
 */
 
-	C_VARIANT:C1683(${2})
+	_O_C_VARIANT:C1683(${2})
 
 	var $code : Text
 	var $i : Integer
@@ -744,7 +742,7 @@ Function callChild($subform; $method : Text; $param; $param1; $paramN)
 
 	// TODO:Returned value
 
-	C_VARIANT:C1683(${3})
+	_O_C_VARIANT:C1683(${3})
 
 	var $code; $target : Text
 	var $i : Integer

diff --git a/Project/Sources/Classes/menu.4dm b/Project/Sources/Classes/menu.4dm
@@ -8,7 +8,6 @@ Class constructor($options)
 
 	This:C1470.__CLASS__:=OB Class:C1730(This:C1470)
 
-	This:C1470.ref:=Null:C1517
 	This:C1470.autoRelease:=True:C214
 	This:C1470.localize:=True:C214
 	This:C1470.metacharacters:=False:C215
@@ -110,7 +109,7 @@ Function release()
 	If (This:C1470._isMenu())
 
 		RELEASE MENU:C978(This:C1470.ref)
-		This:C1470.ref:=Null:C1517
+		This:C1470.ref:=""
 
 	End if 
 
@@ -177,7 +176,7 @@ Function append($item; $param; $mark; $afterItem : Integer) : cs:C1710.menu
 					//______________________________________________________
 				Else 
 
-					$t:=Get localized string:C991($item)
+					$t:=Localized string:C991($item)
 
 					//______________________________________________________
 			End case 
@@ -1202,7 +1201,7 @@ Function _cleanup()
 	// === === === === === === === === === === === === === === === === === === === === === === === === === ===
 Function _isMenu() : Boolean
 
-	If (Asserted:C1132(This:C1470.ref#Null:C1517; Current method name:C684+": The menu reference is null"))
+	If (Asserted:C1132((This:C1470.ref#Null:C1517) && (This:C1470.ref#""); Current method name:C684+": The menu reference is null"))
 
 		return True:C214
 

diff --git a/Project/Sources/Classes/windowDelegate.4dm b/Project/Sources/Classes/windowDelegate.4dm
@@ -41,7 +41,7 @@ Class constructor($param)
 			//______________________________________________________
 	End case 
 
-	This:C1470.ready:=True:C214
+	This:C1470._.ready:=True:C214
 
 	// <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <==
 Function get type() : Integer
@@ -233,7 +233,7 @@ Function set title($title : Text)
 
 	var $t : Text
 
-	$t:=Get localized string:C991($title)
+	$t:=Localized string:C991($title)
 	SET WINDOW TITLE:C213($t ? $t : $title; This:C1470.ref)
 
 	// <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <==

diff --git a/Project/Sources/Methods/COMPILER_4DPop.4dm b/Project/Sources/Methods/COMPILER_4DPop.4dm
diff --git a/Project/Sources/dependencies.json b/Project/Sources/dependencies.json
@@ -2,35 +2,67 @@
   "dependencies": {
     "4DPop": {
       "github": "vdelachaux/4DPop",
-      "tag": "20.6.3"
+      "version": "latest"
     },
     "4DPop AppMaker": {
       "github": "vdelachaux/4DPop-AppMaker",
-      "tag": "20.6.0"
+      "version": "latest"
     },
     "4DPop Git": {
       "github": "vdelachaux/4DPop-Git",
-      "tag": "20.6.0"
+      "version": "latest"
     },
     "4DPop Macros": {
       "github": "vdelachaux/4DPop-Macros",
-      "tag": "20.6.2"
+      "version": "latest"
     },
     "4DPop QuickOpen": {
       "github": "vdelachaux/4DPop-QuickOpen",
-      "tag": "20.6.0"
-    },
-    "4DPop Bookmarks": {},
-    "4DPop Clipboard": {},
-    "4DPop ColorChart": {},
-    "4DPop Commands": {},
-    "4DPop Constants Editor": {},
-    "4DPop Image Buddy": {},
-    "4DPop KeepIt": {},
-    "4DPop Pasteboard": {},
-    "4DPop Rulers": {},
-    "4DPop sqlSchemas": {},
-    "4DPop Window": {},
-    "4DPop XLIFF Pro": {}
+      "version": "latest"
+    },
+    "4DPop XLIFF Pro": {
+      "github": "vdelachaux/4DPop-XLIFF-Pro",
+      "version": "latest"
+    },
+    "4DPop Bookmarks": {
+      "github": "vdelachaux/4DPop-Bookmarks",
+      "version": "latest"
+    },
+    "4DPop ColorChart": {
+      "github": "vdelachaux/4DPop-ColorChart",
+      "version": "latest"
+    },
+    "4DPop Commands": {
+      "github": "vdelachaux/4DPop-Commands",
+      "version": "latest"
+    },
+    "4DPop Constants Editor": {
+      "github": "vdelachaux/4DPop-Constants-Editor",
+      "version": "latest"
+    },
+    "4DPop Image Buddy": {
+      "github": "vdelachaux/4DPop-Image-Buddy",
+      "version": "latest"
+    },
+    "4DPop KeepIt": {
+      "github": "vdelachaux/4DPop-KeepIt",
+      "version": "latest"
+    },
+    "4DPop Pasteboard": {
+      "github": "vdelachaux/4DPop-Pasteboard",
+      "version": "latest"
+    },
+    "4DPop Rulers": {
+      "github": "vdelachaux/4DPop-Rulers",
+      "version": "latest"
+    },
+    "4DPop sqlSchemas": {
+      "github": "vdelachaux/4DPop-sqlSchemas",
+      "version": "latest"
+    },
+    "4DPop Window": {
+      "github": "vdelachaux/4DPop-Window",
+      "version": "latest"
+    }
   }
 }
diff --git a/Project/Sources/folders.json b/Project/Sources/folders.json
@@ -92,7 +92,6 @@
 	"4️⃣ 4DPop": {
 		"methods": [
 			"_4DPopXliff",
-			"COMPILER_4DPop",
 			"editor"
 		]
 	},

diff --git a/README.md b/README.md
@@ -1,23 +1,17 @@
-[code-shield]: https://img.shields.io/static/v1?label=language&message=4d&color=blue
-[code-url]: https://developer.4d.com/
-[license-url]: LICENSE
-[notarized]: https://img.shields.io/badge/notarized-blue
-
-[code-top]: https://img.shields.io/github/languages/top/vdelachaux/4DPop-XLIFF-Pro.svg
-[code-size]: https://img.shields.io/github/languages/code-size/vdelachaux/4DPop-XLIFF-Pro.svg
-[release-shield]: https://img.shields.io/github/v/release/vdelachaux/4DPop-XLIFF-Pro?include_prereleases
-[release-url]: https://github.com/vdelachaux/4DPop-XLIFF-Pro/releases/latest
-[license-shield]: https://img.shields.io/github/license/vdelachaux/4DPop-XLIFF-Pro
-[build-shield]: https://github.com/vdelachaux/4DPop-XLIFF-Pro/actions/workflows/build.yml/badge.svg
-[build-url]: https://github.com/vdelachaux/4DPop-XLIFF-Pro/actions/workflows/build.yml
-
-[![language][code-shield]][code-url]
-[![language-top][code-top]][code-url]
-![code-size][code-size]
-[![license][license-shield]][license-url]
+<!-- MARKDOWN LINKS & IMAGES -->
+[release-shield]: https://img.shields.io/github/v/release/vdelachaux/4DPop-XLIFF-Pro.svg?include_prereleases
+[release-url]: https://github.com/vdelachaux/4DPop-XLIFF-Pro.svg/releases/latest
+
+[license-shield]: https://img.shields.io/github/license/vdelachaux/4DPop-XLIFF-Pro.svg
+
+<!--BADGES-->
+![Static Badge](https://img.shields.io/badge/Dev%20Component-blue?logo=4d&link=https%3A%2F%2Fdeveloper.4d.com)
+![Static Badge](https://img.shields.io/badge/Project%20Dependencies-blue?logo=4d&link=https%3A%2F%2Fdeveloper.4d.com%2Fdocs%2FProject%2Fcomponents%2F%23loading-components)
+<br>
 [![release][release-shield]][release-url]
-[![build][build-shield]][license-url]
-![notarized][notarized]
+[![license][license-shield]](LICENSE)
+<br>
+<img src="https://img.shields.io/github/downloads/vdelachaux/4DPop-XLIFF-Pro/total"/>
 
 # 4DPop XLIFF Pro
 

diff --git a/Resources/InfoPlist.strings b/Resources/InfoPlist.strings