diff options
author | Erik Johnston <erik@matrix.org> | 2015-01-22 13:35:34 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-01-22 13:35:34 +0000 |
commit | 7f058c5ff743e2cf563b9aa5436ee9801a14e633 (patch) | |
tree | 8ef0270ede93c304b0859c4e8fba49b9581b2514 /scripts | |
parent | Add twisted Service interface (diff) | |
parent | Move experiments, graph and cmdclient into contrib (diff) | |
download | synapse-7f058c5ff743e2cf563b9aa5436ee9801a14e633.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj-perf
Conflicts: synapse/app/homeserver.py
Diffstat (limited to '')
-rwxr-xr-x | scripts/copyrighter-sql.pl | 33 | ||||
-rwxr-xr-x | scripts/database-prepare-for-0.0.1.sh (renamed from database-prepare-for-0.0.1.sh) | 0 | ||||
-rwxr-xr-x | scripts/database-prepare-for-0.5.0.sh (renamed from database-prepare-for-0.5.0.sh) | 0 | ||||
-rwxr-xr-x | scripts/database-save.sh (renamed from database-save.sh) | 0 | ||||
-rwxr-xr-x | scripts/nuke-room-from-db.sh (renamed from nuke-room-from-db.sh) | 0 | ||||
-rw-r--r-- | scripts/sphinx_api_docs.sh (renamed from sphinx_api_docs.sh) | 0 |
6 files changed, 33 insertions, 0 deletions
diff --git a/scripts/copyrighter-sql.pl b/scripts/copyrighter-sql.pl new file mode 100755 index 0000000000..890e51e587 --- /dev/null +++ b/scripts/copyrighter-sql.pl @@ -0,0 +1,33 @@ +#!/usr/bin/perl -pi +# Copyright 2015 OpenMarket Ltd +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +$copyright = <<EOT; +/* Copyright 2015 OpenMarket Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +EOT + +s/^(# -\*- coding: utf-8 -\*-\n)?/$1$copyright/ if ($. == 1); diff --git a/database-prepare-for-0.0.1.sh b/scripts/database-prepare-for-0.0.1.sh index 43d759a5cd..43d759a5cd 100755 --- a/database-prepare-for-0.0.1.sh +++ b/scripts/database-prepare-for-0.0.1.sh diff --git a/database-prepare-for-0.5.0.sh b/scripts/database-prepare-for-0.5.0.sh index e824cb583e..e824cb583e 100755 --- a/database-prepare-for-0.5.0.sh +++ b/scripts/database-prepare-for-0.5.0.sh diff --git a/database-save.sh b/scripts/database-save.sh index 040c8a4943..040c8a4943 100755 --- a/database-save.sh +++ b/scripts/database-save.sh diff --git a/nuke-room-from-db.sh b/scripts/nuke-room-from-db.sh index 58c036c896..58c036c896 100755 --- a/nuke-room-from-db.sh +++ b/scripts/nuke-room-from-db.sh diff --git a/sphinx_api_docs.sh b/scripts/sphinx_api_docs.sh index ee72b29657..ee72b29657 100644 --- a/sphinx_api_docs.sh +++ b/scripts/sphinx_api_docs.sh |