2 files changed, 0 insertions, 64 deletions
diff --git a/build/mergejs.php b/build/mergejs.php
deleted file mode 100644
index e747337ef6a..00000000000
--- a/build/mergejs.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * @copyright 2017, Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-
-/*
- * Stupid simple code to merge all the default vendor javascript into 1
- */
-$data = json_decode(file_get_contents(__DIR__.'/../core/js/core.json'), true);
-$vendors = $data['vendor'];
-
-$vendorjs = fopen(__DIR__.'/../core/vendor/core.js', 'w');
-foreach($vendors as $vendor) {
-	$content = file_get_contents(__DIR__.'/../core/vendor/'.$vendor);
-	// Remove the sourceMappingURL references from the merged file
-	$content = preg_replace('@//# sourceMappingURL=.*$@', '', $content);
-	fwrite($vendorjs, $content);
-	fwrite($vendorjs, PHP_EOL);
-}
-fclose($vendorjs);
diff --git a/build/mergejschecker.sh b/build/mergejschecker.sh
deleted file mode 100755
index aee2629956b..00000000000
--- a/build/mergejschecker.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-#Regenerate the vendors core.js
-echo
-echo "Regenerating core/vendor/core.js"
-
-d=`dirname $(readlink -f $0)`
-
-php $d/mergejs.php
-
-files=`git diff --name-only`
-
-for file in $files
-do
-    if [[ $file == core/vendor/core.js ]]
-    then
-        echo "The merged vendor file is not up to date"
-        echo "Please run: php build/mergejs.php"
-        echo "And commit the result"
-        break
-    fi
-done
-
-echo "Vendor js merged as expected. Carry on"
-exit 0