backup/ROC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into es17.01

Browse Source 
# Conflicts:
#	modules/google_search_20/google_search_20-safe.ecf
#	modules/google_search_20/google_search_20.ecf
This commit is contained in:
Jocelyn Fiat
2017-04-10 18:21:55 +02:00
parent fb52bfe099 d26fc98492
commit 5c2f5381aa
3 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/google_search_20/google_search_20.ecf
+1 -1
View File
@@ -4,7 +4,7 @@
<root all_classes="true"/> <root all_classes="true"/>
<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/> <library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
<library name="cms" location="..\..\cms.ecf" readonly="false"/> <library name="cms" location="..\..\cms.ecf" readonly="false"/>
<library name="cms_app_env" location="..\..\library\app_env\app_env.ecf" readonly="false"/> <library name="cms_app_env" location="..\..\library\app_env\app_env.ecf"/>
<library name="wsf" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf.ecf"/> <library name="wsf" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf.ecf"/>
<cluster name="src" location="src\" recursive="true"/> <cluster name="src" location="src\" recursive="true"/>
</target> </target>
modules/google_search_20/src/google_custom_search_module_20.e
-7
View File
@@ -22,13 +22,6 @@ inherit
CMS_HOOK_BLOCK_HELPER CMS_HOOK_BLOCK_HELPER
SHARED_EXECUTION_ENVIRONMENT
export
{NONE} all
end
REFACTORING_HELPER
SHARED_LOGGER SHARED_LOGGER
create create
tools/install.bat
+2
View File
@@ -54,6 +54,7 @@ echo Install ROC as CMS ewf
%SAFE_RMDIR% %TMP_UNSTABLE_DIR%\library\web\cms\library %SAFE_RMDIR% %TMP_UNSTABLE_DIR%\library\web\cms\library
%SAFE_RMDIR% %TMP_UNSTABLE_DIR%\library\web\cms\src %SAFE_RMDIR% %TMP_UNSTABLE_DIR%\library\web\cms\src
%SAFE_RMDIR% %TMP_UNSTABLE_DIR%\library\web\cms\doc %SAFE_RMDIR% %TMP_UNSTABLE_DIR%\library\web\cms\doc
%SAFE_RMDIR% %TMP_UNSTABLE_DIR%\library\web\cms\dev_modules
%SAFE_RMDIR% %TMP_UNSTABLE_DIR%\library\web\cms\modules %SAFE_RMDIR% %TMP_UNSTABLE_DIR%\library\web\cms\modules
%SAFE_RMDIR% %TMP_UNSTABLE_DIR%\library\web\cms\examples %SAFE_RMDIR% %TMP_UNSTABLE_DIR%\library\web\cms\examples
@@ -62,6 +63,7 @@ echo Install ROC as CMS ewf
%COPYCMD% %TMP_DIR%\src %TMP_UNSTABLE_DIR%\library\web\cms\src %COPYCMD% %TMP_DIR%\src %TMP_UNSTABLE_DIR%\library\web\cms\src
%COPYCMD% %TMP_DIR%\doc %TMP_UNSTABLE_DIR%\library\web\cms\doc %COPYCMD% %TMP_DIR%\doc %TMP_UNSTABLE_DIR%\library\web\cms\doc
%COPYCMD% %TMP_DIR%\modules %TMP_UNSTABLE_DIR%\library\web\cms\modules %COPYCMD% %TMP_DIR%\modules %TMP_UNSTABLE_DIR%\library\web\cms\modules
%COPYCMD% %TMP_DIR%\dev_modules %TMP_UNSTABLE_DIR%\library\web\cms\dev_modules
%COPYCMD% %TMP_DIR%\examples %TMP_UNSTABLE_DIR%\library\web\cms\examples %COPYCMD% %TMP_DIR%\examples %TMP_UNSTABLE_DIR%\library\web\cms\examples
echo TOOLS echo TOOLS
%COPYCMD% %TMP_DIR%\tools %TMP_UNSTABLE_DIR%\library\web\cms\tools %COPYCMD% %TMP_DIR%\tools %TMP_UNSTABLE_DIR%\library\web\cms\tools