Changeset 2615:09b5b27127a8

Timestamp:

12/11/13 12:21:37 (12 years ago)

Author:

Nicolas <nikrou77@…>

Branch:

default

Message:

Update Makefile
Activate dcLegacyEditor by default
Addresses #1896

Files:

• Makefile (modified) (3 diffs)
• inc/prepend.php (modified) (1 diff)
• plugins/dcLegacyEditor/_install.php (modified) (1 diff)

Makefile

@@ -40 +40 @@
      ./$(DC)/themes/
 
-     ## Copy built-in plugins
-     cp -pRf \
-     ./plugins/aboutConfig \
-     ./plugins/akismet \
-     ./plugins/antispam \
-     ./plugins/attachments \
-     ./plugins/blogroll \
-     ./plugins/blowupConfig \
-     ./plugins/dclegacy \
-     ./plugins/fairTrackbacks \
-     ./plugins/importExport \
-     ./plugins/maintenance \
-     ./plugins/tags \
-     ./plugins/pages \
-     ./plugins/pings \
-     ./plugins/simpleMenu \
-     ./plugins/themeEditor \
-     ./plugins/userPref \
-     ./plugins/widgets \
+     ## Copy built-in plugins based on DC_DISTRIB_PLUGINS constant
+     cp -pRf $$(grep DC_DISTRIB_PLUGINS inc/prepend.php | \
+          sed -e "s/.*,'//" -e "s/'.*//" | \
+          sed -e  's/\(^\|,\)/ .\/plugins\//g') \
      ./$(DC)/plugins/
 
@@ -68 +53 @@
      find $(DC)/admin/js/ie7/*.js -exec ./build-tools/min-js.php \{\} \;
      find $(DC)/admin/js/jquery/*.js -exec ./build-tools/min-js.php \{\} \;
-     find $(DC)/admin/js/jsToolBar/*.js -exec ./build-tools/min-js.php \{\} \;
      find $(DC)/admin/js/jsUpload/*.js -exec ./build-tools/min-js.php \{\} \;
      find $(DC)/plugins -name '*.js' -exec ./build-tools/min-js.php \{\} \;
@@ -134 +118 @@
 
 
+copy-plugins: clean

inc/prepend.php

@@ -142 +142 @@
 define('DC_L10N_ROOT',dirname(__FILE__).'/../locales');
 define('DC_L10N_UPDATE_URL','http://services.dotclear.net/dc2.l10n/?version=%s');
-define('DC_DISTRIB_PLUGINS','aboutConfig,akismet,antispam,attachments,blogroll,blowupConfig,dclegacy,fairTrackbacks,importExport,maintenance,pages,pings,simpleMenu,tags,themeEditor,userPref,widgets');
+define('DC_DISTRIB_PLUGINS','aboutConfig,akismet,antispam,attachments,blogroll,blowupConfig,dclegacy,fairTrackbacks,importExport,maintenance,pages,pings,simpleMenu,tags,themeEditor,userPref,widgets,dcLegacyEditor');
 define('DC_DISTRIB_THEMES','blueSilence,blowupConfig,customCSS,default,ductile');
 define('DC_DEFAULT_TPLSET','mustek');

plugins/dcLegacyEditor/_install.php

@@ -21 +21 @@
 $settings->addNamespace('dclegacyeditor');
 
-$settings->dclegacyeditor->put('active', false, 'boolean', 'dcLegacyEditor plugin activated ?', false);
+$settings->dclegacyeditor->put('active', true, 'boolean', 'dcLegacyEditor plugin activated ?', false);
 
 $core->setVersion('dclegacyeditor', $version);