diff --git a/.gitignore b/.gitignore index 9c1a299..83ac19b 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /mailman-api /utils/gitlab-irc /build-area +/packages diff --git a/.mrconfig b/.mrconfig index 9502d65..bc23d56 100644 --- a/.mrconfig +++ b/.mrconfig @@ -6,14 +6,14 @@ checkout = git clone https://github.com/colab-community/colab.git --branch pypi [mailman-api] checkout = git clone https://github.com/TracyWebTech/mailman-api.git -[simplejson] +[mailman-api/simplejson] checkout = git clone https://github.com/simplejson/simplejson.git -[bottle] +[mailman-api/bottle] checkout = git clone https://github.com/defnull/bottle.git -[paste] +[mailman-api/paste] checkout = hg clone http://bitbucket.org/ianb/paste -[six] +[mailman-api/paste/six] checkout = hg clone https://bitbucket.org/gutworth/six diff --git a/build_setuptools_rpms.sh b/build_setuptools_rpms.sh index 9167578..4d807bb 100755 --- a/build_setuptools_rpms.sh +++ b/build_setuptools_rpms.sh @@ -4,22 +4,24 @@ mr checkout # Copiando os arquivos de configuração editados -CONFIGS="bottle mailman-api" +CONFIGS="mailman-api" for cfg in $CONFIGS; do echo "Copying $cfg setup.cfg..."; cp cfg/${cfg}_setup.cfg $cfg/setup.cfg done -# Criando os rpms -DIRS="six simplejson paste bottle mailman-api" +# Criando os rpms na pasta packages +DIRS="mailman-api/paste/six mailman-api/paste mailman-api/bottle + mailman-api/simplejson mailman-api" mkdir -p packages for dir in $DIRS; do + curdir=`pwd` cd $dir; python setup.py bdist_rpm; - cp dist/*.rpm ../packages; - cd ..; + cp dist/*.rpm $curdir/packages; + cd $curdir; done -- libgit2 0.21.2