[PATCH] fix build with --disable-scripting option

[David Ostrovsky (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/2510

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/10/2510/1

fix build with --disable-scripting option

Change-Id: I98dbd3e46c81e1dd056d6e88dc1e526b5af456f5
---
M scp2/source/ooo/file_library_ooo.scp
M scp2/source/ooo/file_ooo.scp
M scp2/source/ooo/file_resource_ooo.scp
3 files changed, 25 insertions(+), 21 deletions(-)



diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 1da3175..292a05f 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -42,6 +42,8 @@
 
 #ifndef DISABLE_SCRIPTING
 
+STD_LIB_FILE( gid_File_Lib_Sf_Prothdlr, protocolhandler )
+
 File gid_File_Lib_Basprov
     LIB_FILE_BODY;
     Styles = (PACKED);
@@ -62,6 +64,21 @@
   #else
     Name = STRING(CONCAT3(vbaevents,.uno,.dll));
   #endif
+End
+
+File gid_File_Lib_Scriptframe
+    LIB_FILE_BODY;
+  #ifdef UNX
+    #ifdef MACOSX
+       Name = "libscriptframe.dylib";
+    #else
+       Name = "libscriptframe.so";
+    #endif
+  #else
+    Name = "scriptframe.dll";
+  #endif
+    Dir = SCP2_OOO_BIN_DIR;
+    Styles = (PACKED);
 End
 
 #endif
@@ -280,8 +297,6 @@
   #endif
 End
 
-#endif
-
 File gid_File_Lib_Stringresource
     LIB_FILE_BODY;
     Styles = (PACKED);
@@ -292,8 +307,6 @@
     Name = STRING(CONCAT3(stringresource,.uno,.dll));
   #endif
 End
-
-#ifndef DISABLE_SCRIPTING
 
 File gid_File_Lib_Vbaobj
     LIB_FILE_BODY;
@@ -1004,21 +1017,6 @@
 
 STD_LIB_FILE( gid_File_Lib_Scn, scn)
 
-File gid_File_Lib_Scriptframe
-    LIB_FILE_BODY;
-  #ifdef UNX
-    #ifdef MACOSX
-       Name = "libscriptframe.dylib";
-    #else
-       Name = "libscriptframe.so";
-    #endif
-  #else
-    Name = "scriptframe.dll";
-  #endif
-    Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED);
-End
-
 STD_LIB_FILE( gid_File_Lib_Sd , sd)
 STD_LIB_FILE( gid_File_Lib_Sdui, sdui)
 
@@ -1045,8 +1043,6 @@
 End
 
 STD_LIB_FILE( gid_File_Lib_Sdd , sdd)
-
-STD_LIB_FILE( gid_File_Lib_Sf_Prothdlr, protocolhandler )
 
 File gid_File_Lib_Sfx
     Name = LIBNAME(sfx);
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index a5c2eb9..38e8003 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -57,12 +57,16 @@
     Name = "basicsrvform.zip";
 End
 
+#ifndef DISABLE_SCRIPTING
+
 File gid_File_Basic_Scriptbindinglib
     Dir = gid_Dir_Basic_Scriptbindinglib;
     ARCHIVE_TXT_FILE_BODY;
     Name = "scriptbindinglib.zip";
 End
 
+#endif
+
 File gid_File_Basic_Template
     Dir = gid_Dir_Basic_Template;
     ARCHIVE_TXT_FILE_BODY;
diff --git a/scp2/source/ooo/file_resource_ooo.scp b/scp2/source/ooo/file_resource_ooo.scp
index 29559dc..67a30ed 100644
--- a/scp2/source/ooo/file_resource_ooo.scp
+++ b/scp2/source/ooo/file_resource_ooo.scp
@@ -27,8 +27,12 @@
 
 #include "macros.inc"
 
+#ifndef DISABLE_SCRIPTING
+
 STD_RES_FILE( gid_File_Res_Basctl, basctl)
 
+#endif
+
 STD_RES_FILE( gid_File_Res_Bib, bib )
 
 STD_RES_FILE( gid_File_Res_Chartcontroller, chartcontroller )

-- 
To view, visit https://gerrit.libreoffice.org/2510
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I98dbd3e46c81e1dd056d6e88dc1e526b5af456f5
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: David Ostrovsky <David.Ostrovsky at gmx.de>