jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: rename scripts directory to dev-scripts
......................................................................
Hygiene: rename scripts directory to dev-scripts
...to avoid people confusing them with maintenance scripts and just make
their puprose more clear.
Change-Id: I0b6392313f1653b92f6e98069119a2bdaa382676
---
M .gitignore
M Makefile
M README.mediawiki
M composer.lock
R dev-scripts/.htaccess
R dev-scripts/cachedpage.sh
R dev-scripts/cucumber.sh
R dev-scripts/cucumber_check.sh
R dev-scripts/message.py
R dev-scripts/nodecheck.sh
R dev-scripts/phpcheck.sh
R dev-scripts/phplint.sh
R dev-scripts/pre-commit
R dev-scripts/pre-review
R dev-scripts/qunit.sh
A dev-scripts/remotecheck.sh
R dev-scripts/unused-images.sh
R dev-scripts/validatehtml.sh
D scripts/remotecheck.sh
19 files changed, 29 insertions(+), 29 deletions(-)
Approvals:
JGonera: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.gitignore b/.gitignore
index 141d66d..8334fbd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,6 @@
node_modules/
tmp/
docs/
-scripts/remotes
+dev-scripts/remotes
vendor/
composer.phar
diff --git a/Makefile b/Makefile
index 801871b..a226590 100644
--- a/Makefile
+++ b/Makefile
@@ -5,21 +5,21 @@
bundle install
clean:
- rm -Rf scripts/remotes
+ rm -Rf dev-scripts/remotes
rm -Rf docs
remotes:
- @scripts/remotecheck.sh
+ @dev-scripts/remotecheck.sh
message:
- @scripts/message.py
+ @dev-scripts/message.py
# Requires GERRIT_USERNAME to be defined - lists patchsets you need to amend
mygerrit: remotes
- @scripts/remotes/gerrit.py --project
'mediawiki/extensions/MobileFrontend' --byuser ${GERRIT_USERNAME} --ltscore 0
+ @dev-scripts/remotes/gerrit.py --project
'mediawiki/extensions/MobileFrontend' --byuser ${GERRIT_USERNAME} --ltscore 0
gerrit: remotes
- @scripts/remotes/gerrit.py --project
'mediawiki/extensions/MobileFrontend' --gtscore -1
+ @dev-scripts/remotes/gerrit.py --project
'mediawiki/extensions/MobileFrontend' --gtscore -1
kss: nodecheck
mkdir -p docs
@@ -36,7 +36,7 @@
docs: kss jsduck
nodecheck:
- @scripts/nodecheck.sh
+ @dev-scripts/nodecheck.sh
jshinttests: nodecheck
@node_modules/.bin/jshint tests/qunit/* --config .jshintrc
@@ -47,34 +47,34 @@
dependencies: nodecheck phpcheck remotes
phpcheck:
- @scripts/phpcheck.sh
+ @dev-scripts/phpcheck.sh
phplint: phpcheck
- @scripts/phplint.sh
+ @dev-scripts/phplint.sh
phpunit:
cd ${MW_INSTALL_PATH}/tests/phpunit && php phpunit.php --configuration
${MW_INSTALL_PATH}/extensions/MobileFrontend/tests/phpunit/mfe.suite.xml
--group=MobileFrontend
qunit:
- @scripts/qunit.sh
+ @dev-scripts/qunit.sh
qunitdebug:
- @scripts/qunit.sh 'MobileFrontend&debug=true'
+ @dev-scripts/qunit.sh 'MobileFrontend&debug=true'
tests: jshint phpunit qunit
cucumber:
- @scripts/cucumber.sh
+ @dev-scripts/cucumber.sh
checkcucumber:
- @scripts/cucumber_check.sh
+ @dev-scripts/cucumber_check.sh
lint: jshint phplint checkcucumber
installhooks:
- ln -sf ${PWD}/scripts/pre-commit .git/hooks/pre-commit
- ln -sf ${PWD}/scripts/pre-review .git/hooks/pre-review
+ ln -sf ${PWD}/dev-scripts/pre-commit .git/hooks/pre-commit
+ ln -sf ${PWD}/dev-scripts/pre-review .git/hooks/pre-review
# user must create W3CValidationTest wiki page with text 'Hello world' for
this to work
validatehtml:
- @scripts/validatehtml.sh
+ @dev-scripts/validatehtml.sh
diff --git a/README.mediawiki b/README.mediawiki
index e0c9a4b..e093a7a 100644
--- a/README.mediawiki
+++ b/README.mediawiki
@@ -15,7 +15,7 @@
https://www.mediawiki.org/wiki/MobileFrontend/Coding_conventions
==== Git hooks ====
-Git hooks are provided in the scripts directory to assist with adhering
+Git hooks are provided in the dev-scripts directory to assist with adhering
to JavaScript code standards, optimizing PNG files, etc. Install like
so:
diff --git a/composer.lock b/composer.lock
index b739891..5225be0 100644
--- a/composer.lock
+++ b/composer.lock
@@ -24,8 +24,8 @@
"php": ">=5.1.2"
},
"bin": [
- "scripts/phpcs",
- "scripts/phpcbf"
+ "dev-scripts/phpcs",
+ "dev-scripts/phpcbf"
],
"type": "library",
"extra": {
diff --git a/scripts/.htaccess b/dev-scripts/.htaccess
similarity index 100%
rename from scripts/.htaccess
rename to dev-scripts/.htaccess
diff --git a/scripts/cachedpage.sh b/dev-scripts/cachedpage.sh
similarity index 92%
rename from scripts/cachedpage.sh
rename to dev-scripts/cachedpage.sh
index 0efe987..21698a0 100755
--- a/scripts/cachedpage.sh
+++ b/dev-scripts/cachedpage.sh
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
-#usage ./scripts/cachedpage.sh 1bd5bc53ebb04fff7f508712a29fdf1f1d7fe14f
San_Francisco
+#usage ./dev-scripts/cachedpage.sh 1bd5bc53ebb04fff7f508712a29fdf1f1d7fe14f
San_Francisco
if
! git diff --exit-code --quiet # check for unstaged changes
diff --git a/scripts/cucumber.sh b/dev-scripts/cucumber.sh
similarity index 100%
rename from scripts/cucumber.sh
rename to dev-scripts/cucumber.sh
diff --git a/scripts/cucumber_check.sh b/dev-scripts/cucumber_check.sh
similarity index 100%
rename from scripts/cucumber_check.sh
rename to dev-scripts/cucumber_check.sh
diff --git a/scripts/message.py b/dev-scripts/message.py
similarity index 100%
rename from scripts/message.py
rename to dev-scripts/message.py
diff --git a/scripts/nodecheck.sh b/dev-scripts/nodecheck.sh
similarity index 100%
rename from scripts/nodecheck.sh
rename to dev-scripts/nodecheck.sh
diff --git a/scripts/phpcheck.sh b/dev-scripts/phpcheck.sh
similarity index 100%
rename from scripts/phpcheck.sh
rename to dev-scripts/phpcheck.sh
diff --git a/scripts/phplint.sh b/dev-scripts/phplint.sh
similarity index 100%
rename from scripts/phplint.sh
rename to dev-scripts/phplint.sh
diff --git a/scripts/pre-commit b/dev-scripts/pre-commit
similarity index 94%
rename from scripts/pre-commit
rename to dev-scripts/pre-commit
index cb2ec09..f43d91a 100755
--- a/scripts/pre-commit
+++ b/dev-scripts/pre-commit
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
# Enable this pre-commit hook by executing the following from the project root
directory
-# $ ln -s $PWD/scripts/pre-commit .git/hooks/pre-commit
+# $ ln -s $PWD/dev-scripts/pre-commit .git/hooks/pre-commit
# check for trailing whitespace
if [[ `git diff --cached --check` ]]; then
diff --git a/scripts/pre-review b/dev-scripts/pre-review
similarity index 100%
rename from scripts/pre-review
rename to dev-scripts/pre-review
diff --git a/scripts/qunit.sh b/dev-scripts/qunit.sh
similarity index 100%
rename from scripts/qunit.sh
rename to dev-scripts/qunit.sh
diff --git a/dev-scripts/remotecheck.sh b/dev-scripts/remotecheck.sh
new file mode 100755
index 0000000..684ecae
--- /dev/null
+++ b/dev-scripts/remotecheck.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+if [ ! -e "dev-scripts/remotes/gerrit.py" ]
+then
+ mkdir -p dev-scripts/remotes
+ echo 'Installing GerritCommandLine tool'
+ curl -o dev-scripts/remotes/gerrit.py
https://raw.github.com/jdlrobson/GerritCommandLine/master/gerrit.py
+ chmod +x dev-scripts/remotes/gerrit.py
+fi
diff --git a/scripts/unused-images.sh b/dev-scripts/unused-images.sh
similarity index 100%
rename from scripts/unused-images.sh
rename to dev-scripts/unused-images.sh
diff --git a/scripts/validatehtml.sh b/dev-scripts/validatehtml.sh
similarity index 100%
rename from scripts/validatehtml.sh
rename to dev-scripts/validatehtml.sh
diff --git a/scripts/remotecheck.sh b/scripts/remotecheck.sh
deleted file mode 100755
index afc1955..0000000
--- a/scripts/remotecheck.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-if [ ! -e "scripts/remotes/gerrit.py" ]
-then
- mkdir -p scripts/remotes
- echo 'Installing GerritCommandLine tool'
- curl -o scripts/remotes/gerrit.py
https://raw.github.com/jdlrobson/GerritCommandLine/master/gerrit.py
- chmod +x scripts/remotes/gerrit.py
-fi
--
To view, visit https://gerrit.wikimedia.org/r/135083
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0b6392313f1653b92f6e98069119a2bdaa382676
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: MaxSem <[email protected]>
Gerrit-Reviewer: Awjrichards <[email protected]>
Gerrit-Reviewer: JGonera <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
