diff options
| author | Alan McGovern <alan.mcgovern@gmail.com> | 2012-05-17 15:54:37 +0400 |
|---|---|---|
| committer | Alan McGovern <alan.mcgovern@gmail.com> | 2012-05-17 15:54:37 +0400 |
| commit | e933d54abc80989c2e75778adae3b9a289d640d4 (patch) | |
| tree | 669066561bf7d5452b045ecc6c4c2f765f34b495 | |
| parent | bb81e5032e14b2db4d36308b40be2dbbf2a4c3b4 (diff) | |
[Build] Distinguish between externals and addins
All the submodule tarballs are put into tarballs/external. These
are then merged into the main monodevelop tarball. The regular addin
tarballs are left unmerged.
| -rw-r--r-- | Makefile | 12 | ||||
| -rw-r--r-- | main/external/Makefile.am | 2 |
2 files changed, 9 insertions, 5 deletions
@@ -64,12 +64,16 @@ dist: update_submodules remove-stale-tarballs dist-recursive cp -f $$t/*.spec specs ;\ fi \ done - @cd tarballs && for tb in `ls .`; do \ + @cd tarballs && for tb in `ls external`; do \ echo Decompressing $$tb; \ - tar xvjf $$tb; \ - rm $$tb; \ + tar xvjf external/$$tb; \ done - cd tarballs && tar -cjf monodevelop-$PACKAGE_VERSION_LABEL.tar.bz2 monodevelop-$PACKAGE_VERSION_LABEL + @rm -rf tarballs/external + @echo Decompressing monodevelop-$(PACKAGE_VERSION_LABEL).tar.bz2 + @cd tarballs && tar xvjf monodevelop-$(PACKAGE_VERSION_LABEL).tar.bz2 + @echo Generating merged tarball + @cd tarballs && tar -cjf monodevelop-$(PACKAGE_VERSION_LABEL).tar.bz2 monodevelop-$(PACKAGE_VERSION_LABEL) + @cd tarballs && rm -rf monodevelop-$(PACKAGE_VERSION_LABEL) run: cd main && make run diff --git a/main/external/Makefile.am b/main/external/Makefile.am index 569d9c5578..aaf32be4a9 100644 --- a/main/external/Makefile.am +++ b/main/external/Makefile.am @@ -1,4 +1,4 @@ -TARBALL_PATH=../../tarballs +TARBALL_PATH=../../tarballs/external NGIT_SLN=ngit/ngit.sln NGIT=$(NGIT_SLN) /t:NGit |