Prepare AMOS for Moodle 3.0 branch

moodlehq · May 27, 2015 · 371bab4 · 371bab4
1 parent 2fcf6e8
commit 371bab4
Show file tree

Hide file tree

Showing 9 changed files with 530 additions and 10 deletions.
diff --git a/admin/newlanguage.php b/admin/newlanguage.php
@@ -38,7 +38,7 @@
 $form = new local_amos_newlanguage_form();
 
 if ($data = $form->get_data()) {
-    $component = new mlang_component('langconfig', $data->langcode, mlang_version::by_code(mlang_version::MOODLE_29));
+    $component = new mlang_component('langconfig', $data->langcode, mlang_version::by_code(mlang_version::MOODLE_30));
     $data->langname = mlang_string::fix_syntax($data->langname);
     $data->langnameint = mlang_string::fix_syntax($data->langnameint);
     $component->add_string(new mlang_string('thislanguage', $data->langname));

diff --git a/cli/export-installer.php b/cli/export-installer.php
@@ -35,11 +35,11 @@
 
 // list of branches to process
 $branches = array(
-    'MOODLE_25_STABLE',
     'MOODLE_26_STABLE',
     'MOODLE_27_STABLE',
     'MOODLE_28_STABLE',
     'MOODLE_29_STABLE',
+    'MOODLE_30_STABLE',
 );
 
 fputs(STDOUT, "*****************************************\n");
@@ -50,7 +50,7 @@
 
 foreach ($branches as $branch) {
     fputs(STDOUT, "BRANCH {$branch}\n");
-    if ($branch == 'MOODLE_29_STABLE') {
+    if ($branch == 'MOODLE_30_STABLE') {
         $gitbranch = 'origin/master';
     } else {
         $gitbranch = 'origin/' . $branch;

diff --git a/cli/fix-drift.php b/cli/fix-drift.php
@@ -46,7 +46,7 @@
 foreach ($plugins as $versionnumber => $plugintypes) {
     $version = mlang_version::by_dir($versionnumber);
 
-    if ($version->branch == 'MOODLE_29_STABLE') {
+    if ($version->branch == 'MOODLE_30_STABLE') {
         $gitbranch = 'origin/master';
     } else {
         $gitbranch = 'origin/' . $version->branch;

diff --git a/cli/parse-core.php b/cli/parse-core.php
@@ -273,11 +273,11 @@ function amos_parse_core_commit() {
 );
 
 $MLANG_PARSE_BRANCHES = array(
-    'MOODLE_25_STABLE',
     'MOODLE_26_STABLE',
     'MOODLE_27_STABLE',
     'MOODLE_28_STABLE',
     'MOODLE_29_STABLE',
+    'MOODLE_30_STABLE',
 );
 
 $standardplugins = local_amos_standard_plugins();
@@ -290,7 +290,7 @@ function amos_parse_core_commit() {
 foreach ($MLANG_PARSE_BRANCHES as $branch) {
     fputs(STDOUT, "=========================================\n");
     fputs(STDOUT, "BRANCH {$branch}\n");
-    if ($branch == 'MOODLE_29_STABLE') {
+    if ($branch == 'MOODLE_30_STABLE') {
         $gitbranch = 'origin/master';
     } else {
         $gitbranch = 'origin/' . $branch;

diff --git a/cli/utilslib.php b/cli/utilslib.php
@@ -249,6 +249,7 @@ protected function get_versions() {
                 mlang_version::MOODLE_27,
                 mlang_version::MOODLE_28,
                 mlang_version::MOODLE_29,
+                mlang_version::MOODLE_30,
             );
             $versions = array();
             foreach ($codes as $code) {

diff --git a/jobs/install-packs-publish b/jobs/install-packs-publish
@@ -12,7 +12,7 @@ REPO=~/amos/git/moodle-install/
 
 cd $REPO
 git fetch upstream
-for BRANCH in master MOODLE_28_STABLE MOODLE_27_STABLE MOODLE_26_STABLE MOODLE_25_STABLE; do
+for BRANCH in master MOODLE_29_STABLE MOODLE_28_STABLE MOODLE_27_STABLE MOODLE_26_STABLE; do
 	git checkout $BRANCH
 	git merge upstream/$BRANCH
 done
@@ -45,11 +45,11 @@ function update_branch {
 	git push git@gitlab-amos:amosbot/moodle-install.git $2:$2
 }
 
-update_branch install_master master 2.9
+update_branch install_master master 3.0
+update_branch install_29_STABLE MOODLE_29_STABLE 2.9
 update_branch install_28_STABLE MOODLE_28_STABLE 2.8
 update_branch install_27_STABLE MOODLE_27_STABLE 2.7
 update_branch install_26_STABLE MOODLE_26_STABLE 2.6
-update_branch install_25_STABLE MOODLE_25_STABLE 2.5
 
 cd $REPO
 git gc
diff --git a/jobs/zip-packs-snapshot b/jobs/zip-packs-snapshot
@@ -10,7 +10,7 @@ CLONESROOT=~/amos/git/moodle-langpacks-clones
 
 rsync -a --exclude 'README*' --exclude '*.zip' --exclude '.git' $AMOSDATAROOT/temp/export-zip/ $CLONESROOT
 
-for VER in 2.0 2.1 2.2 2.3 2.4 2.5 2.6 2.7 2.8 2.9 ; do
+for VER in 2.0 2.1 2.2 2.3 2.4 2.5 2.6 2.7 2.8 2.9 3.0 ; do
     cd $CLONESROOT/$VER
     set +e
     git add .

diff --git a/mlanglib.php b/mlanglib.php
@@ -1529,6 +1529,7 @@ class mlang_version {
     const MOODLE_27 = 2700;
     const MOODLE_28 = 2800;
     const MOODLE_29 = 2900;
+    const MOODLE_30 = 3000;
 
     /** @var int internal code of the version */
     public $code;
@@ -1629,6 +1630,14 @@ protected function __construct(array $info) {
      */
     protected static function versions_info() {
         return array(
+            array(
+                'code'          => self::MOODLE_30,
+                'label'         => 'DEV',
+                'branch'        => 'MOODLE_30_STABLE',
+                'dir'           => '3.0',
+                'translatable'  => true,
+                'current'       => false,
+            ),
             array(
                 'code'          => self::MOODLE_29,
                 'label'         => '2.9',