This is an automated email from the ASF dual-hosted git repository.

ardovm pushed a commit to branch scons-build
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit a97f01c55e4519ea0fa155de8ba85e986faf5301
Author: Arrigo Marchiori <ard...@yahoo.it>
AuthorDate: Sun Apr 2 14:24:29 2023 +0200

    Tentative SConscript for solenv
---
 main/site_scons/config.py |  9 +++++----
 main/solenv/SConscript    | 26 ++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/main/site_scons/config.py b/main/site_scons/config.py
index ebc03e043d..ce4c57cd9a 100644
--- a/main/site_scons/config.py
+++ b/main/site_scons/config.py
@@ -24,8 +24,7 @@ import os
 _siteDir, _myFilename = os.path.split(os.path.abspath(__file__))
 _mainDir, _siteDir2 = os.path.split(_siteDir)
 
-# Or should we patch set_soenv to generate us a .py file?
-def loadJavaProperties(filepath):
+def loadProperties(filepath):
     props = {}
     fullLine = ''
     appending = False
@@ -51,5 +50,7 @@ def loadJavaProperties(filepath):
                             props[key] = value
     return props
 
-soenv = loadJavaProperties(_mainDir + '/ant.properties')
-
+# Or should we patch set_soenv to generate us a .py file?
+soenv = loadProperties(os.path.join(_mainDir, 'ant.properties'))
+versionFile = os.path.join(_mainDir, 'solenv', 'inc', 'version.lst')
+version = loadProperties(versionFile)
diff --git a/main/solenv/SConscript b/main/solenv/SConscript
new file mode 100644
index 0000000000..dada41e7df
--- /dev/null
+++ b/main/solenv/SConscript
@@ -0,0 +1,26 @@
+import os.path
+import config
+
+## Generate the versionlist.hrc file
+def generateVersionList(target, source, env):
+    for t in target:
+        with open(str(t), "w") as f:
+            f.write("""#define VERSION %s
+#define SUBVERSION %s
+#define MICROVERSION %s
+#define VER_DAY %s
+#define VER_MONTH %s
+#define VER_YEAR %s
+""" % (config.version["OOOBASEVERSIONMAJOR"],
+       config.version["OOOBASEVERSIONMINOR"],
+       config.version["OOOBASEVERSIONMICRO"],
+       config.version["OOOBASEVERSIONDAY"],
+       config.version["OOOBASEVERSIONMONTH"],
+       config.version["OOOBASEVERSIONYEAR"]))
+
+# Package versionlist
+env = DefaultEnvironment().Clone()
+env.Command(os.path.join("CustomTarget", "solenv", "inc", "versionlist.hrc"),
+            config.versionFile, generateVersionList)
+env.Command(os.path.join("bin", "version.lst"), os.path.join("inc", 
"version.lst"),
+            Copy("$TARGET", "$SOURCE"))

Reply via email to