[Libreoffice-commits] core.git: desktop/CppunitTest_desktop_lib.mk Repository.mk scp2/source wizards/Module_wizards.mk wizards/source

Jean-Pierre Ledure (via logerrit) logerrit at kemper.freedesktop.org
Sat Nov 7 06:33:46 UTC 2020


 Repository.mk                         |    4 ++++
 desktop/CppunitTest_desktop_lib.mk    |    4 ++++
 scp2/source/ooo/directory_ooo.scp     |   20 ++++++++++++++++++++
 wizards/Module_wizards.mk             |    4 ++++
 wizards/source/configshare/dialog.xlc |    4 ++++
 wizards/source/configshare/script.xlc |    4 ++++
 6 files changed, 40 insertions(+)

New commits:
commit fa842219d08fdc3f341ec5d1f494895e1004bd6e
Author:     Jean-Pierre Ledure <jp at ledure.be>
AuthorDate: Fri Nov 6 16:16:00 2020 +0100
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Sat Nov 7 07:33:06 2020 +0100

    ScriptForge - Update build files
    
            modified:   Repository.mk
            modified:   desktop/CppunitTest_desktop_lib.mk
            modified:   scp2/source/ooo/directory_ooo.scp
            modified:   wizards/Module_wizards.mk
            modified:   wizards/source/configshare/dialog.xlc
            modified:   wizards/source/configshare/script.xlc
    
    Change-Id: Ia2c905179f3c1784a1bd31fcca7340e65c5ce27a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105410
    Tested-by: Jean-Pierre Ledure <jp at ledure.be>
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
    Reviewed-by: Jean-Pierre Ledure <jp at ledure.be>

diff --git a/Repository.mk b/Repository.mk
index d821025277d2..c887d9b4297d 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -930,6 +930,10 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
 	wizards_basicsrvgimmicks \
 	wizards_basicsrvimport \
 	wizards_basicsrvform \
+	wizards_basicsrvscriptforge \
+	wizards_basicsrvsfdatabases \
+	wizards_basicsrvsfdialogs \
+	wizards_basicsrvsfdocuments \
 	wizards_basicsrvstandard \
 	wizards_basicsrvtemplate \
 	wizards_basicsrvtools \
diff --git a/desktop/CppunitTest_desktop_lib.mk b/desktop/CppunitTest_desktop_lib.mk
index 8b375235b05d..68a7ca8f2aed 100644
--- a/desktop/CppunitTest_desktop_lib.mk
+++ b/desktop/CppunitTest_desktop_lib.mk
@@ -65,6 +65,10 @@ $(eval $(call gb_CppunitTest_use_packages,desktop_lib, \
     wizards_basicsrvform \
     wizards_basicsrvgimmicks \
     wizards_basicsrvimport \
+    wizards_basicsrvscriptforge \
+    wizards_basicsrvsfdatabases \
+    wizards_basicsrvsfdialogs \
+    wizards_basicsrvsfdocuments \
     wizards_basicsrvtemplate \
     wizards_basicsrvtools \
 ))
diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
index d172f74a3f84..1b8243e74979 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -265,6 +265,26 @@ Directory gid_Dir_Basic_Tools
     DosName = "Tools";
 End
 
+Directory gid_Dir_Basic_ScriptForge
+    ParentID = gid_Dir_Basic;
+    DosName = "ScriptForge";
+End
+
+Directory gid_Dir_Basic_SFDatabases
+    ParentID = gid_Dir_Basic;
+    DosName = "SFDatabases";
+End
+
+Directory gid_Dir_Basic_SFDialogs
+    ParentID = gid_Dir_Basic;
+    DosName = "SFDialogs";
+End
+
+Directory gid_Dir_Basic_SFDocuments
+    ParentID = gid_Dir_Basic;
+    DosName = "SFDocuments";
+End
+
 Directory gid_Dir_Basic_Importwiz
     ParentID = gid_Dir_Basic;
     DosName = "ImportWizard";
diff --git a/wizards/Module_wizards.mk b/wizards/Module_wizards.mk
index ccc8b3c7422a..003a60b9d0fe 100644
--- a/wizards/Module_wizards.mk
+++ b/wizards/Module_wizards.mk
@@ -29,6 +29,10 @@ $(eval $(call gb_Module_add_targets,wizards,\
 	Package_gimmicks \
 	Package_import \
 	Package_share \
+	Package_scriptforge \
+	Package_sfdatabases \
+	Package_sfdialogs \
+	Package_sfdocuments \
 	Package_standard \
 	Package_template \
 	Package_tools \
diff --git a/wizards/source/configshare/dialog.xlc b/wizards/source/configshare/dialog.xlc
index 89647f648b69..4e3a29ae3398 100644
--- a/wizards/source/configshare/dialog.xlc
+++ b/wizards/source/configshare/dialog.xlc
@@ -10,4 +10,8 @@
  <library:library library:name="Depot" xlink:href="$(INST)/@LIBO_SHARE_FOLDER@/basic/Depot/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
  <library:library library:name="ScriptBindingLibrary" xlink:href="$(INST)/@LIBO_SHARE_FOLDER@/basic/ScriptBindingLibrary/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
  <library:library library:name="Access2Base" xlink:href="$(INST)/@LIBO_SHARE_FOLDER@/basic/Access2Base/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
+ <library:library library:name="ScriptForge" xlink:href="$(INST)/@LIBO_SHARE_FOLDER@/basic/ScriptForge/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
+ <library:library library:name="SFDatabases" xlink:href="$(INST)/@LIBO_SHARE_FOLDER@/basic/SFDatabases/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
+ <library:library library:name="SFDialogs" xlink:href="$(INST)/@LIBO_SHARE_FOLDER@/basic/SFDialogs/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
+ <library:library library:name="SFDocuments" xlink:href="$(INST)/@LIBO_SHARE_FOLDER@/basic/SFDocuments/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
  </library:libraries>
diff --git a/wizards/source/configshare/script.xlc b/wizards/source/configshare/script.xlc
index 69dbb2832db3..06a4cc20145e 100644
--- a/wizards/source/configshare/script.xlc
+++ b/wizards/source/configshare/script.xlc
@@ -10,4 +10,8 @@
  <library:library library:name="Depot" xlink:href="$(INST)/@LIBO_SHARE_FOLDER@/basic/Depot/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
  <library:library library:name="ScriptBindingLibrary" xlink:href="$(INST)/@LIBO_SHARE_FOLDER@/basic/ScriptBindingLibrary/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
  <library:library library:name="Access2Base" xlink:href="$(INST)/@LIBO_SHARE_FOLDER@/basic/Access2Base/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
+ <library:library library:name="ScriptForge" xlink:href="$(INST)/@LIBO_SHARE_FOLDER@/basic/ScriptForge/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
+ <library:library library:name="SFDatabases" xlink:href="$(INST)/@LIBO_SHARE_FOLDER@/basic/SFDatabases/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
+ <library:library library:name="SFDialogs" xlink:href="$(INST)/@LIBO_SHARE_FOLDER@/basic/SFDialogs/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
+ <library:library library:name="SFDocuments" xlink:href="$(INST)/@LIBO_SHARE_FOLDER@/basic/SFDocuments/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
 </library:libraries>


More information about the Libreoffice-commits mailing list