From d94b08eaf07f80899b1a1949c8c03dd84f425379 Mon Sep 17 00:00:00 2001 From: Ian Kelling Date: Sat, 18 Jun 2016 17:30:02 -0700 Subject: [PATCH 1/1] working build scripts --- LICENSE | 202 ++++++++++++++++++++++++++++++++++++++++++++++++++++ elisp | 25 +++++++ emacs | 142 ++++++++++++++++++++++++++++++++++++ org-mode | 47 ++++++++++++ tor-browser | 48 +++++++++++++ 5 files changed, 464 insertions(+) create mode 100644 LICENSE create mode 100755 elisp create mode 100755 emacs create mode 100755 org-mode create mode 100755 tor-browser diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..d645695 --- /dev/null +++ b/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/elisp b/elisp new file mode 100755 index 0000000..21ff0db --- /dev/null +++ b/elisp @@ -0,0 +1,25 @@ +#!/bin/bash -l +# Copyright (C) 2016 Ian Kelling + +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at + +# http://www.apache.org/licenses/LICENSE-2.0 + +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +if [[ $1 == -u ]]; then + u="git pull" +else + u= +fi + +cd ~/.emacs.d/src/gnus +$u +# from README +./configure && make diff --git a/emacs b/emacs new file mode 100755 index 0000000..5082b20 --- /dev/null +++ b/emacs @@ -0,0 +1,142 @@ +#!/bin/bash -l +# Copyright (C) 2016 Ian Kelling + +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at + +# http://www.apache.org/licenses/LICENSE-2.0 + +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +set -eE -o pipefail +trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?"' ERR + +set -x +# arg = git commit to check out +# -r = don't recompile from scratch +# -u = update sources + +# stop if any the command fails +update=false +recompile=true + +while [[ $1 == -* ]]; do + case $1 in + -r) recompile=false; shift ;; + -u) update=true; shift ;; + --) break ;; + esac +done + +export CFLAGS="-Og -g3" + +logq pi texlive hunspell git +case $(distro-name) in + fedora ) + # before i learned the builddep command, i identified these + # dependencies. Not sure if the builddep took care of them all + # gtk3-devel libXpm-devel libjpeg-turbo-devel libtiff-devel giflib-devel ncurses-devel gnutls-devel libxml2-devel libotf-devel GConf2-devel gpm-devel librsvg2-devel ImageMagick-devel m17n-lib-devel libselinux-devel + + logq s yum-builddep -y emacs + logq pi texlive-dvipng + ;;& + debian|ubuntu) + # oddly, on ubuntu 14.04 this installs postfix, but I dun care + # ubuntu 14.04 gave this error message + # Unable to satisfy the build-depends: Build-Depends: libpng-dev + # this is satisfied by dvipng. the build-dep is just wrong + # minor bug I'm not going to bother reporting + logq p -y build-dep emacs + # fyi libmagick is broken right now because it uses a fork which is waiting for emacs to support it + # not sure how many of these are satisfied by the prev command, + # but from the log, it looks like none of them + logq pi libacl1-dev libselinux-dev libm17n-dev libgtk-3-dev \ + librsvg2-dev libgpm-dev libgconf2-dev libotf-dev libxml2-dev \ + automake1.11 libgnutls28-dev libncurses-dev libxpm-dev libjpeg-dev \ + libgif-dev libtiff-dev texinfo dvipng + ;;& + debian) + # included in dependencies on other distros, todo, check on ubuntu + logq pi suckless-tools + ;; +esac + + + +#building emacs, INSTALL.BZR + +#git repo +dir=/a/opt/emacs-`distro-name``debian-archive` + +if [[ ! -e $dir ]]; then + cp -r /a/opt/emacs $dir + recompile=true +fi +cd $dir + +if $recompile; then + # todo, consider when this should be uncommented + #logq s make uninstall + find ~/.emacs.d/ -name '*.elc' -delete + + # git version + if [[ $1 ]]; then + i clean -xxxfd + elif $update; then + i fetch + i clean -xxxffd + i reset --hard origin/master + i clean -xxxffd + fi + + # autogen is usually only for the first build, assume it works + logq ./autogen.sh + # I tried changing O2 to O3, don't know if it made it faster or slower so I went back to 02. + # Also, link-time-optimization based on ./INSTALL + + # for debugging, use -Og, or -O0 to make debug really correspond to sources + # dunno why I have had -std=gnu99 in the past + #CFLAGS='-std=gnu99 -g3 -Og' + export CFLAGS='-g3 -Og' + #CFLAGS='-std=gnu99 -g3 -O2' logq ./configure --enable-link-time-optimization + # on ubuntu 12.04, the above fails, says my c compiler won't work, so intead, just use defaults + logq ./configure + logq make -j `nproc` bootstrap +fi + +# temporarily for testing multiple versions + +logq sudo make install + +# make emacs always work for root +s lnf /usr/local/bin/emacs /usr/bin + + + +logq emacs --batch -l ~/.emacs.d/init.el -l ~/.emacs.d/compile-init-dir.el + +# not keeping up with the latest org-mode development +#~/bin/buildscripts/org-mode + +if $update; then + logq pi bzr + cd ~/.emacs.d/src/mediawiki-el + bzr pull +fi + + +# not keeping up with the latest gnus development. +# # instructions from the README +# # the byte-recompile-directory seems to compile gnus, +# # but gnus complains that it should be compiled when it starts +# cd ~/.emacs.d/src/gnus +# if [[ $1 == *u* ]]; then +# i pull +# fi +# logq ./configure +# logq make diff --git a/org-mode b/org-mode new file mode 100755 index 0000000..0474aa9 --- /dev/null +++ b/org-mode @@ -0,0 +1,47 @@ +#!/bin/bash -l +# Copyright (C) 2016 Ian Kelling + +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at + +# http://www.apache.org/licenses/LICENSE-2.0 + +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# git clone git://orgmode.org/org-mode.git +# texinfo is all that is technically needed, but having tex for math is good + +set -eE -o pipefail +trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?"' ERR + +logq pi git texlive install-info + +cd /a/opt/org-mode + +if isdeb; then + logq pi texinfo +else + logq pi texinfo-tex +fi +rm -rf !(.git) +i checkout -f errbuff + +if [[ $1 == -u ]]; then + git fetch + git rebase master +fi + +# org mode doesn't make native binaries, so it is portable, and we keep it .emacs.d +# org-learn is a dependency of org-drill +dd of=local.mk <<'EOF' +ORG_ADD_CONTRIB = org-drill org-learn +EMACS = /usr/bin/emacs +prefix = /a/c/.emacs.d +EOF +rm -rf /a/c/.emacs.d/emacs +logq make install diff --git a/tor-browser b/tor-browser new file mode 100755 index 0000000..7da0ebe --- /dev/null +++ b/tor-browser @@ -0,0 +1,48 @@ +#!/bin/bash -l +# Copyright (C) 2016 Ian Kelling + +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at + +# http://www.apache.org/licenses/LICENSE-2.0 + +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +set -eE -o pipefail +trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?"' ERR + + +# stable version is shown on: +# https://dist.torproject.org/torbrowser/ + +ver=$(curl -s https://dist.torproject.org/torbrowser/ \ + | sed -rn 's/.*href="([0-9]+\.[0-9]+\.[0-9]+).*/\1/p' \ + | sort -Vr | head -n 1) + + +# by default it has perms for just 1 non-root user, which is ok for now. + +cd /a/opt + +f=tor-browser-linux64-${ver}_en-US.tar.xz +timestamp=$(stat -c %Y $f) +wget -N https://www.torproject.org/dist/torbrowser/$ver/$f +if [[ $timestamp == $(stat -c %Y $f) && -e /a/opt/tor-browser_en-US/Browser/start-tor-browser ]]; then + # already installed + exit 0 +fi +rm -rf tor-browser_en-US +ex $f + +for x in tor-*.tar.xz; do + # cleanup old tarballs + [[ -e $x ]] || break + [[ $x != $f ]] || continue + command rm -f $x +done +s lnf /a/opt/tor-browser_en-US/Browser/start-tor-browser /usr/local/bin -- 2.30.2