bf

https://discuss.4d.com/t/4dpop-build-app-issue-appmaker/29550?u=vdl
vdelachaux · Jan 3, 2024 · a85086d · a85086d
1 parent e367a0a
commit a85086d
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 17 deletions.
diff --git a/Build/4DPop AppMaker.4dbase.zip b/Build/4DPop AppMaker.4dbase.zip
diff --git a/Build/Components/4DPop AppMaker.4dbase/4DPop AppMaker.4DZ b/Build/Components/4DPop AppMaker.4dbase/4DPop AppMaker.4DZ
diff --git a/Build/Components/4DPop AppMaker.4dbase/Info.plist b/Build/Components/4DPop AppMaker.4dbase/Info.plist
@@ -4,17 +4,17 @@
 
   <dict>
     <key>NSHumanReadableCopyright</key>
-    <string>©vdl 2009-2023</string>
+    <string>©vdl 2009-2024</string>
     <key>CFBundleVersion</key>
-    <string>571</string>
+    <string>572</string>
     <key>CFBundleDisplayName</key>
     <string>4DPop AppMaker</string>
     <key>CFBundleShortVersionString</key>
-    <string>20R4</string>
+    <string>20R5</string>
     <key>CFBundleGetInfoString</key>
-    <string>20R4</string>
+    <string>20R5</string>
     <key>CFBundleLongVersionString</key>
-    <string>20R4 (570)</string>
+    <string>20R5 (571)</string>
     <key>CFBundleName</key>
     <string>4DPop AppMaker</string>
   </dict>

diff --git a/Build/Components/4DPop AppMaker.4dbase/Libraries/lib4d-arm64.dylib b/Build/Components/4DPop AppMaker.4dbase/Libraries/lib4d-arm64.dylib
diff --git a/Build/Components/4DPop AppMaker.4dbase/Resources/InfoPlist.strings b/Build/Components/4DPop AppMaker.4dbase/Resources/InfoPlist.strings
diff --git a/Info.plist b/Info.plist
@@ -4,17 +4,17 @@
 
   <dict>
     <key>NSHumanReadableCopyright</key>
-    <string>©vdl 2009-2023</string>
+    <string>©vdl 2009-2024</string>
     <key>CFBundleVersion</key>
-    <string>571</string>
+    <string>572</string>
     <key>CFBundleDisplayName</key>
     <string>4DPop AppMaker</string>
     <key>CFBundleShortVersionString</key>
-    <string>20R4</string>
+    <string>20R5</string>
     <key>CFBundleGetInfoString</key>
-    <string>20R4</string>
+    <string>20R5</string>
     <key>CFBundleLongVersionString</key>
-    <string>20R4 (570)</string>
+    <string>20R5 (571)</string>
     <key>CFBundleName</key>
     <string>4DPop AppMaker</string>
   </dict>

diff --git a/Project/Sources/Classes/prefs.4dm b/Project/Sources/Classes/prefs.4dm
@@ -1,3 +1,6 @@
+property file : 4D:C1709.File
+property content; rootElement : Text
+
 Class constructor($file : 4D:C1709.File; $rootElement : Text)
 
 	var $content; $root : Text
@@ -15,6 +18,8 @@ Class constructor($file : 4D:C1709.File; $rootElement : Text)
 		DOM EXPORT TO VAR:C863($root; $content)
 		DOM CLOSE XML:C722($root)
 
+		This:C1470.file.setText($content)
+
 	End if 
 
 	This:C1470.content:=$content
@@ -33,7 +38,6 @@ Function load() : Object
 
 	return $o
 
-
 	// === === === === === === === === === === === === === === === === === === ===
 Function save()
 

diff --git a/Project/Sources/Classes/xml.4dm b/Project/Sources/Classes/xml.4dm
@@ -21,9 +21,8 @@ Class constructor($variable)
 
 	//———————————————————————————————————————————————————————————
 	// Creates a XML tree in memory
-Function newRef($root : Text; $nameSpace : Text)->$this : cs:C1710.xml
+Function newRef($root : Text; $nameSpace : Text;  ...  : Text)->$this : cs:C1710.xml
 
-	var ${3} : Text
 	var $t : Text
 	var $countParam; $i : Integer
 
@@ -131,9 +130,7 @@ Function setOption($selector : Integer; $value : Integer)->$this : cs:C1710.xml
 
 	//———————————————————————————————————————————————————————————
 	// Set the value of one or more XML options for the structure
-Function setOptions($selector : Integer; $value : Integer)->$this : cs:C1710.xml
-	var ${3} : Integer
-
+Function setOptions($selector : Integer; $value : Integer;  ...  : Integer)->$this : cs:C1710.xml
 	var $i : Integer
 
 	This:C1470.success:=((Count parameters:C259%2)=0)

diff --git a/Resources/InfoPlist.strings b/Resources/InfoPlist.strings
diff --git a/lastbuild b/lastbuild
@@ -1 +1 @@
-20R4
+20R5