From e646898137de3897cdabdb65d2ad553e45c772c1 Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Sat, 24 Dec 2016 10:40:50 +0100 Subject: [PATCH] feat(binaries): remove download information --- Makefile | 10 +--------- src/bash/docker-build-cli.bash | 6 ------ src/bash/linux-deploy.bash | 9 --------- src/bash/linux-deployment-to-downloads.bash | 19 ------------------- src/bash/osx-deploy.bash | 13 ------------- src/mako/cli/README.md.mako | 8 +------- 6 files changed, 2 insertions(+), 63 deletions(-) delete mode 100755 src/bash/docker-build-cli.bash delete mode 100755 src/bash/linux-deploy.bash delete mode 100755 src/bash/linux-deployment-to-downloads.bash delete mode 100755 src/bash/osx-deploy.bash diff --git a/Makefile b/Makefile index 541e258aec0..6de61913c1e 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -.PHONY: help deps regen-apis license ubuntu-build wheezy-build clean +.PHONY: help deps regen-apis license clean .SUFFIXES: VENV = .virtualenv/virtualenv.py @@ -9,8 +9,6 @@ MAKO_RENDER := etc/bin/mako-render API_VERSION_GEN := etc/bin/api_version_to_yaml.py TPL := $(PYTHON) $(MAKO_RENDER) MKDOCS := $(shell pwd)/$(VENV_DIR)/bin/mkdocs -WHEEZY_IMAGE := byron/rust-binaries.nightly.debian-wheezy -WHEEZY_BUILD_OUTPUT := build/wheezy-x64 MAKO_SRC = src/mako RUST_SRC = src/rust @@ -42,7 +40,6 @@ help: $(info help-cli - show all cli targets to build individually) $(info docs-all - cargo-doc on all APIs and associates, assemble them together and generate index) $(info docs-all-clean - remove the entire set of generated documentation) - $(info wheezy-build - build --release all CLI on ubuntu using docker) $(info github-pages - invoke ghp-import on all documentation) $(info regen-apis - clear out all generated apis, and regenerate them) $(info license - regenerate the main license file) @@ -79,11 +76,6 @@ LICENSE.md: $(MAKO_SRC)/LICENSE.md.mako $(API_SHARED_INFO) $(MAKO_RENDER) license: LICENSE.md -wheezy-build: - @-rm -Rf WHEEZY_BUILD_OUTPUT - @mkdir -p $(WHEEZY_BUILD_OUTPUT) - docker run -v $(PWD):/source -v $(PWD)/$(WHEEZY_BUILD_OUTPUT):/build-result $(WHEEZY_IMAGE) /source/src/bash/docker-build-cli.bash - regen-apis: | clean-all-api clean-all-cli gen-all-api gen-all-cli license clean: clean-all-api clean-all-cli docs-all-clean diff --git a/src/bash/docker-build-cli.bash b/src/bash/docker-build-cli.bash deleted file mode 100755 index fcad528416b..00000000000 --- a/src/bash/docker-build-cli.bash +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -# For execution on docker build image only ! -# make cargo-cli ARGS="build --release" -# DEBUG: only try to build a small CLI for now -make discovery1-cli-cargo ARGS="build --release" -find gen -executable -type f -path "*/release/*" -not \( -name "*.*" -or -name "*script*" \) | xargs -J % cp -v % /build-result \ No newline at end of file diff --git a/src/bash/linux-deploy.bash b/src/bash/linux-deploy.bash deleted file mode 100755 index 55a8f6166c7..00000000000 --- a/src/bash/linux-deploy.bash +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -echo "NOTE: I assume you have called the respective make cargo-cli ARGS=build beforehand" -version=${1:?First argument must be the version CLI we deploy, like v0.1.0} -rtype=${2:?Second argument is either 'release' or 'debug'} - -tar_basename=google-apis-rs_cli-${version}_linux-x86-64_${rtype} -tar_file=${tar_basename}.tar.gz -tar -czf $tar_file --transform "s%^.*/%%" -T <(find target -executable -type f -path "*/${rtype}/*" -not \( -name "*.*" -or -name "*script*" -or -regex ".*-[a-f0-9]{16}" \)) || exit $? -echo Wrote $tar_file diff --git a/src/bash/linux-deployment-to-downloads.bash b/src/bash/linux-deployment-to-downloads.bash deleted file mode 100755 index 78cfed16189..00000000000 --- a/src/bash/linux-deployment-to-downloads.bash +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -# A specialized script which copies the contents of deployment tar files to a given location, suitable -# to be served as -tar_file=${1:?Must be .tar file produced by any of the *-deploy.sh scripts} -program_type=${2:?Is the type of the program contained in the tar file, e.g. cli} -version=${3:?The program version contained in the tar file, e.g. 0.2.0 (no leading v)} -os_name=${4:?The OS name on which the contents of the tar files was produced, e.g. osx, ubuntu} -base_dir=${5:?Is the root path of the download directory, e.g. /var/www/downloads} - - -dest_dir=${base_dir}/google.rs/${program_type}/${version}/${os_name} -mkdir -p ${dest_dir} || exit $? -cd ${dest_dir} && tar -xzvf ${tar_file} || exit $? -for file in `find . -executable -type f`; do - program_tar_file=${file}.tar.gz - tar -czf ${program_tar_file} $file && rm $file && echo "Created ${program_tar_file}" -done - -echo Extracted programs from $tar_file to ${dest_dir} diff --git a/src/bash/osx-deploy.bash b/src/bash/osx-deploy.bash deleted file mode 100755 index 7507e85bf22..00000000000 --- a/src/bash/osx-deploy.bash +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -echo "NOTE: I assume you have called the respective make cargo-cli ARGS=build beforehand" -version=${1:?First argument must be the version CLI we deploy, like v0.1.0} -rtype=${2:?Second argument is either 'release' or 'debug'} - -tar_basename=google-apis-rs_cli-${version}_osx-10.10_${rtype} -tar_file=${tar_basename}.tar.gz -dest_dir=build/$tar_basename -mkdir -p $dest_dir || exit $? -find -E target -perm +0111 -type f -path "*/${rtype}/*" -not \( -name "*.*" -or -name "*script*" -or -regex ".*-[a-f0-9]{16}" \) | xargs -J % cp -v % $dest_dir || exit $? -(cd $dest_dir && tar -czvf ../${tar_file} `find . -perm +0111 -type f`) || exit $? -rm -Rfv $dest_dir || exit $? -echo Wrote build/$tar_file diff --git a/src/mako/cli/README.md.mako b/src/mako/cli/README.md.mako index 38935ea48eb..0fb946015c3 100644 --- a/src/mako/cli/README.md.mako +++ b/src/mako/cli/README.md.mako @@ -21,13 +21,7 @@ Everything else about the *${util.canonical_name()}* API can be found at the [official documentation site](${documentationLink}). % endif -# Downloads - -You can download the pre-compiled 64bit binaries for the following platforms: - -% for os_name in make.platforms: -* ![icon](${url_info.asset_urls.get('%s_img' % os_name)}) [${os_name}](${program_download_url(url_info.download_base_url, 'cli', cargo.build_version, os_name, name, version)}) -% endfor +# Source Code Find the source code [on github](${util.github_source_root_url()}).