mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scp2: rename misleading WITHOUT_EXTENSION_SCRIPTING_BEANSHELL/JAVSCRIPT

Browse Source 
Change-Id: Id8524bcfa3d593584afbad0b5dcc1cc48aa377d7
This commit is contained in:
Michael Stahl
2012-10-08 13:12:15 +02:00
parent 4c5589a397
commit d4214aab9c
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
configure.in
View File

@@ -10217,7 +10217,7 @@ if test "${enable_scripting_beanshell}" != "no" -a "x$with_java" != "xno"; then
else else
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
ENABLE_SCRIPTING_BEANSHELL=NO ENABLE_SCRIPTING_BEANSHELL=NO
SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_SCRIPTING_BEANSHELL" SCPDEFS="$SCPDEFS -DWITHOUT_SCRIPTING_BEANSHELL"
fi fi
AC_SUBST(ENABLE_SCRIPTING_BEANSHELL) AC_SUBST(ENABLE_SCRIPTING_BEANSHELL)
AC_SUBST(SYSTEM_BSH) AC_SUBST(SYSTEM_BSH)
@@ -10251,7 +10251,7 @@ if test "${enable_scripting_javascript}" != "no" -a "x$with_java" != "xno"; then
else else
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
ENABLE_SCRIPTING_JAVASCRIPT=NO ENABLE_SCRIPTING_JAVASCRIPT=NO
SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_SCRIPTING_JAVASCRIPT" SCPDEFS="$SCPDEFS -DWITHOUT_SCRIPTING_JAVASCRIPT"
fi fi
AC_SUBST(ENABLE_SCRIPTING_JAVASCRIPT) AC_SUBST(ENABLE_SCRIPTING_JAVASCRIPT)
AC_SUBST(SYSTEM_RHINO) AC_SUBST(SYSTEM_RHINO)

4
scp2/source/extensions/file_extensions.scp
View File

@@ -287,7 +287,7 @@ End
/* ** Script provider for BeanShell ** */ /* ** Script provider for BeanShell ** */
#if defined SOLAR_JAVA && !defined WITHOUT_EXTENSION_SCRIPTING_BEANSHELL #if defined SOLAR_JAVA && !defined WITHOUT_SCRIPTING_BEANSHELL
#if !defined SYSTEM_BSH #if !defined SYSTEM_BSH
STD_JAR_FILE( gid_File_Jar_Bsh, bsh ) STD_JAR_FILE( gid_File_Jar_Bsh, bsh )
@@ -306,7 +306,7 @@ End
/* ** Script provider for JavaScript ** */ /* ** Script provider for JavaScript ** */
#if defined SOLAR_JAVA && !defined WITHOUT_EXTENSION_SCRIPTING_JAVASCRIPT #if defined SOLAR_JAVA && !defined WITHOUT_SCRIPTING_JAVASCRIPT
STD_JAR_FILE( gid_File_Jar_Js, js ) STD_JAR_FILE( gid_File_Jar_Js, js )

4
scp2/source/extensions/module_extensions.scp
View File

@@ -326,7 +326,7 @@ End
/* ** Script provider for BeanShell ** */ /* ** Script provider for BeanShell ** */
#if defined SOLAR_JAVA && !defined WITHOUT_EXTENSION_SCRIPTING_BEANSHELL #if defined SOLAR_JAVA && !defined WITHOUT_SCRIPTING_BEANSHELL
Module gid_Module_Optional_Extensions_Script_Provider_For_Beanshell Module gid_Module_Optional_Extensions_Script_Provider_For_Beanshell
PackageInfo = "packinfo_extensions.txt"; PackageInfo = "packinfo_extensions.txt";
@@ -345,7 +345,7 @@ End
/* ** Script provider for JavaScript ** */ /* ** Script provider for JavaScript ** */
#if defined SOLAR_JAVA && !defined WITHOUT_EXTENSION_SCRIPTING_JAVASCRIPT #if defined SOLAR_JAVA && !defined WITHOUT_SCRIPTING_JAVASCRIPT
Module gid_Module_Optional_Extensions_Script_Provider_For_Javascript Module gid_Module_Optional_Extensions_Script_Provider_For_Javascript
PackageInfo = "packinfo_extensions.txt"; PackageInfo = "packinfo_extensions.txt";

4
scp2/source/ooo/file_ooo.scp
View File

@@ -723,7 +723,7 @@ File gid_File_Scripts_Java
Name = "ScriptsJava.zip"; Name = "ScriptsJava.zip";
End End
#ifndef WITHOUT_EXTENSION_SCRIPTING_BEANSHELL #ifndef WITHOUT_SCRIPTING_BEANSHELL
File gid_File_Scripts_Beanshell File gid_File_Scripts_Beanshell
Dir = gid_Dir_Share_Scripts; Dir = gid_Dir_Share_Scripts;
ARCHIVE_TXT_FILE_BODY; ARCHIVE_TXT_FILE_BODY;
@@ -731,7 +731,7 @@ File gid_File_Scripts_Beanshell
End End
#endif #endif
#ifndef WITHOUT_EXTENSION_SCRIPTING_JAVASCRIPT #ifndef WITHOUT_SCRIPTING_JAVASCRIPT
File gid_File_Scripts_Javascript File gid_File_Scripts_Javascript
Dir = gid_Dir_Share_Scripts; Dir = gid_Dir_Share_Scripts;
ARCHIVE_TXT_FILE_BODY; ARCHIVE_TXT_FILE_BODY;