Skip to content

Commit

Permalink
[build] Generate xamarin.android-oss*.deb (dotnet#1202)
Browse files Browse the repository at this point in the history
Rename `oss-xamarin.android*.deb` to `xamarin.android-oss*.deb`.

We felt that this made things clearer, as it's more inline with what
is done for the Windows `Xamarin.Android.Sdk-OSS*.vsix` (611bb66)
and *might* (possibly?) address any confusion regarding why the
OSS `xamarin-android` package has a different version number than
the *commercial* Xamarin.Android packages, which is currently because
the *revision* value is the number of commits since the version
number has changed, and the `monodroid` and `xamarin-android` repos
will *always* have *different* values for the revision count.

(Rephrased, there is no obvious analog for monodroid 8.1.0.25 in
xamarin-android. *An* analogue would be "the xamarin-android commit
that monodroid 8.1.0.25 is using", but that would currently be
"xamarin-android 8.0.99.76": 6b54d6d..8b34f1d is 76 commits.
Our bad for forgetting to bump the d15-5 `$(PackageVersion)` value.)
  • Loading branch information
directhex authored and jonpryor committed Jan 17, 2018
1 parent f41afb6 commit 2fc9887
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions build-tools/debian-metadata/control
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Source: oss-xamarin.android
Source: xamarin.android-oss
Section: unknown
Priority: optional
Maintainer: Xamarin <[email protected]>
Expand All @@ -8,7 +8,7 @@ Homepage: https://www.xamarin.com/platform
Vcs-Git: https://github.com/xamarin/xamarin-android.git
Vcs-Browser: https://github.com/xamarin/xamarin-android

Package: xamarin.android
Package: xamarin.android-oss
Architecture: amd64
Depends: mono-xbuild (>= 5.2), java8-sdk, ${misc:Depends}, ${shlibs:Depends}
Description: Xamarin.Android libraries and runtime (host component)
Expand Down
8 changes: 4 additions & 4 deletions build-tools/scripts/BuildEverything.mk
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ else
ZIP_EXTENSION = zip
endif

ZIP_OUTPUT_BASENAME = oss-xamarin.android_v$(PRODUCT_VERSION).$(-num-commits-since-version-change)_$(OS)-$(OS_ARCH)_$(GIT_BRANCH)_$(GIT_COMMIT)
ZIP_OUTPUT_BASENAME = xamarin.android-oss_v$(PRODUCT_VERSION).$(-num-commits-since-version-change)_$(OS)-$(OS_ARCH)_$(GIT_BRANCH)_$(GIT_COMMIT)
ZIP_OUTPUT = $(ZIP_OUTPUT_BASENAME).$(ZIP_EXTENSION)


Expand Down Expand Up @@ -182,8 +182,8 @@ package-deb: $(ZIP_OUTPUT)
rm -fr $(ZIP_OUTPUT_BASENAME)
tar xf $(ZIP_OUTPUT)
cp -a build-tools/debian-metadata $(ZIP_OUTPUT_BASENAME)/debian
sed "s/%CONFIG%/$(CONFIGURATION)/" $(ZIP_OUTPUT_BASENAME)/debian/xamarin.android.install.in > $(ZIP_OUTPUT_BASENAME)/debian/xamarin.android.install && rm -f $(ZIP_OUTPUT_BASENAME)/debian/xamarin.android.install.in
sed "s/%CONFIG%/$(CONFIGURATION)/" $(ZIP_OUTPUT_BASENAME)/debian/xamarin.android-oss.install.in > $(ZIP_OUTPUT_BASENAME)/debian/xamarin.android-oss.install && rm -f $(ZIP_OUTPUT_BASENAME)/debian/xamarin.android-oss.install.in
cp LICENSE $(ZIP_OUTPUT_BASENAME)/debian/copyright
ln -sf $(ZIP_OUTPUT) oss-xamarin.android_$(PRODUCT_VERSION).$(-num-commits-since-version-change).orig.tar.bz2
cd $(ZIP_OUTPUT_BASENAME) && DEBEMAIL="Xamarin Public Jenkins (auto-signing) <[email protected]>" dch --create -v $(PRODUCT_VERSION).$(-num-commits-since-version-change) --package oss-xamarin.android --force-distribution --distribution alpha "New release - please see git log for $(GIT_COMMIT)"
ln -sf $(ZIP_OUTPUT) xamarin.android-oss_$(PRODUCT_VERSION).$(-num-commits-since-version-change).orig.tar.bz2
cd $(ZIP_OUTPUT_BASENAME) && DEBEMAIL="Xamarin Public Jenkins (auto-signing) <[email protected]>" dch --create -v $(PRODUCT_VERSION).$(-num-commits-since-version-change) --package xamarin.android-oss --force-distribution --distribution alpha "New release - please see git log for $(GIT_COMMIT)"
cd $(ZIP_OUTPUT_BASENAME) && dpkg-buildpackage -us -uc -rfakeroot

0 comments on commit 2fc9887

Please sign in to comment.