diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-10-08 13:12:15 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-10-08 13:20:11 +0200 |
| commit | d4214aab9c093dab321e6deaeaf5f7e86af1381c (patch) | |
| tree | 59b46a7e9b81cdac2bd5a132fef45528547aaccf /scp2 | |
| parent | 4c5589a397b05515ba4aec0c494f43fb9f750975 (diff) | |
scp2: rename misleading WITHOUT_EXTENSION_SCRIPTING_BEANSHELL/JAVSCRIPT
Change-Id: Id8524bcfa3d593584afbad0b5dcc1cc48aa377d7
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/extensions/file_extensions.scp | 4 | ||||
| -rw-r--r-- | scp2/source/extensions/module_extensions.scp | 4 | ||||
| -rw-r--r-- | scp2/source/ooo/file_ooo.scp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp index 725329553327..90e99875d32e 100644 --- a/scp2/source/extensions/file_extensions.scp +++ b/scp2/source/extensions/file_extensions.scp @@ -287,7 +287,7 @@ End /* ** 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 STD_JAR_FILE( gid_File_Jar_Bsh, bsh ) @@ -306,7 +306,7 @@ End /* ** 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 ) diff --git a/scp2/source/extensions/module_extensions.scp b/scp2/source/extensions/module_extensions.scp index 01d773c017e4..91853ea629e1 100644 --- a/scp2/source/extensions/module_extensions.scp +++ b/scp2/source/extensions/module_extensions.scp @@ -326,7 +326,7 @@ End /* ** 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 PackageInfo = "packinfo_extensions.txt"; @@ -345,7 +345,7 @@ End /* ** 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 PackageInfo = "packinfo_extensions.txt"; diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index a42f6834abd3..ea102c302fdb 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -723,7 +723,7 @@ File gid_File_Scripts_Java Name = "ScriptsJava.zip"; End -#ifndef WITHOUT_EXTENSION_SCRIPTING_BEANSHELL +#ifndef WITHOUT_SCRIPTING_BEANSHELL File gid_File_Scripts_Beanshell Dir = gid_Dir_Share_Scripts; ARCHIVE_TXT_FILE_BODY; @@ -731,7 +731,7 @@ File gid_File_Scripts_Beanshell End #endif -#ifndef WITHOUT_EXTENSION_SCRIPTING_JAVASCRIPT +#ifndef WITHOUT_SCRIPTING_JAVASCRIPT File gid_File_Scripts_Javascript Dir = gid_Dir_Share_Scripts; ARCHIVE_TXT_FILE_BODY; |