Skip to content
This repository has been archived by the owner on Jun 12, 2021. It is now read-only.

Commit

Permalink
Bug 658322 - Add elmo-lib as a submodule in vendor-local, r=pike
Browse files Browse the repository at this point in the history
  • Loading branch information
stasm committed May 26, 2011
1 parent 77d636a commit c588fe2
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 15 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
@@ -1,3 +1,6 @@
[submodule "vendor"]
path = vendor
url = git://github.com/mozilla/playdoh-lib.git
[submodule "vendor-local"]
path = vendor-local
url = git://github.com/mozilla/elmo-lib.git
2 changes: 1 addition & 1 deletion requirements/prod.txt
@@ -1 +1 @@
-e hg+http://hg.mozilla.org/build/compare-locales/@default#egg=compare-locales
-e git+git://github.com/Pike/compare-locales.git#egg=compare-locales
18 changes: 4 additions & 14 deletions scripts/update_site.py
Expand Up @@ -18,14 +18,11 @@
from optparse import OptionParser

# Constants
PROJECT = 0
VENDOR = 1

ENV_BRANCH = {
# 'environment': [PROJECT_BRANCH, VENDOR_BRANCH],
'dev': ['develop', 'master'],
'stage': ['develop', 'master'],
'prod': ['master', 'master'],
'dev': 'develop',
'stage': 'master',
'prod': 'master',
}

GIT_PULL = "git pull -q origin %(branch)s"
Expand All @@ -39,21 +36,14 @@ def update_site(env, debug):
"""Run through commands to update this site."""
error_updating = False
here = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
project_branch = {'branch': ENV_BRANCH[env][PROJECT]}
vendor_branch = {'branch': ENV_BRANCH[env][VENDOR]}
project_branch = {'branch': ENV_BRANCH[env]}

commands = [
(CHDIR, here),
(EXEC, GIT_PULL % project_branch),
(EXEC, GIT_SUBMODULE),
]

commands += [
(CHDIR, os.path.join(here, 'vendor')),
(EXEC, GIT_PULL % vendor_branch),
(EXEC, GIT_SUBMODULE),
]

commands += [
(CHDIR, here),
(EXEC, './vendor/src/schematic/schematic migrations/'),
Expand Down
1 change: 1 addition & 0 deletions vendor-local
Submodule vendor-local added at e4fd9f

0 comments on commit c588fe2

Please sign in to comment.