diff options
author | Harel Ben-Attia <harelba@gmail.com> | 2021-10-20 19:38:32 +0300 |
---|---|---|
committer | Harel Ben-Attia <harelba@gmail.com> | 2021-10-20 19:38:32 +0300 |
commit | 678d4f00a74fb9799877b4ecc67dc37a54925883 (patch) | |
tree | 542f1994053773fb00ace2a08cb86886258850b6 | |
parent | 08e5d2d88560c99e0a667902952e2d44254347ac (diff) |
cleanup
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | README.markdown | 1 | ||||
-rw-r--r-- | RELEASE.md | 27 | ||||
-rwxr-xr-x | build-deb-builder-container | 10 | ||||
-rwxr-xr-x | build-rpm-builder-container | 10 | ||||
-rw-r--r-- | create-windows-setup-instructions | 76 | ||||
-rw-r--r-- | dist/AddToPath.nsh | 440 | ||||
-rwxr-xr-x | dist/create-deb | 11 | ||||
-rwxr-xr-x | dist/create-rpm | 63 | ||||
-rw-r--r-- | dist/deb-builder-Dockerfile | 8 | ||||
-rw-r--r-- | dist/q-TextAsData-with-path.nsi | 182 | ||||
-rw-r--r-- | dist/q-text-as-data.spec.template | 66 | ||||
-rw-r--r-- | dist/rpm-builder-Dockerfile | 12 | ||||
-rw-r--r-- | dist/update-mac-homebrew-instructions | 51 | ||||
-rwxr-xr-x | do-manual-release.sh | 57 | ||||
-rwxr-xr-x | package-release | 43 | ||||
-rw-r--r-- | setup-pyenv.sh | 134 | ||||
-rwxr-xr-x | upload-release | 24 |
18 files changed, 1 insertions, 1215 deletions
@@ -15,3 +15,4 @@ generated-site/ benchmark_data.tar.gz _benchmark_data/ q.egg-info/ +*.egg diff --git a/README.markdown b/README.markdown index 12a2e5f..5d9f232 100644 --- a/README.markdown +++ b/README.markdown @@ -38,4 +38,3 @@ Email [harelba@gmail.com](mailto:harelba@gmail.com) q on twitter: #qtextasdata - diff --git a/RELEASE.md b/RELEASE.md deleted file mode 100644 index 9ba0f02..0000000 --- a/RELEASE.md +++ /dev/null @@ -1,27 +0,0 @@ - -# Releasing a new version -Currently, there are some manual steps needed in order to release a new version: - -* Make sure that you're in `master` -* Change the version in the following three files: `bin/q.py`, `setup.py` and `do-manual-release.sh` and commit them to the branch -* Commit the files locally -* Create a new tag `git tag x.y.z` -* Create a new release in the github UI based on the new tag -* `git push --tags origin master` - -The push will trigger a build/release, and will push the artifacts to the new release as assets. - -Now, create the relevant rpm and deb packages: - -* Run `./package-release <tag> <version>`. In most cases, both will be the same. -* This will download all the released artifacts for the release into `./packages/`, and will create an rpm and a deb -* Test that the two new artifacts (inside `./packages/`) -* Run `./upload-release <tag> <version>` - -The rpm and deb will be added to the assets of the release - -Update the website to match the new version. - -# Requirements -Requires a logged in github-cli (`gh`) to work - diff --git a/build-deb-builder-container b/build-deb-builder-container deleted file mode 100755 index abd021a..0000000 --- a/build-deb-builder-container +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ $# -ne 1 ]; -then - echo "Usage: $(basename $0) <version-tag>" - exit 1 -fi -VERSION_TAG="$1" - -docker build -f dist/deb-builder-Dockerfile -t q-text-as-data-deb-builder:${VERSION_TAG} . diff --git a/build-rpm-builder-container b/build-rpm-builder-container deleted file mode 100755 index 4788f19..0000000 --- a/build-rpm-builder-container +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ $# -ne 1 ]; -then - echo "Usage: $(basename $0) <version-tag>" - exit 1 -fi -VERSION_TAG="$1" - -docker build -f dist/rpm-builder-Dockerfile -t q-text-as-data-rpm-builder:${VERSION_TAG} . diff --git a/create-windows-setup-instructions b/create-windows-setup-instructions deleted file mode 100644 index 9ff5fbe..0000000 --- a/create-windows-setup-instructions +++ /dev/null @@ -1,76 +0,0 @@ - -# Alpha version - process is working, instructions not fully tested for minor details yet. - -Instructions for creating a windows package for q: - -The installation is based on a wine docker container. - -mkdir -p dist/windows - -pushd dist/windows - -fetch all files from https://github.com/harelba/packages-for-q/tree/master/artifactory-for-packaging into that folder. - -tar xvzf PyInstaller-2.1.tar.gz - -Fix pyinstaller to work around a bug by running the following command (use gsed for osx or sed for linux): -gsed -i '1587s/^.*$/ if tpl[2] in ["BINARY", "DATA"]:/' ./PyInstaller-2.1/PyInstaller/build.py - -popd - - -d=`pwd` -cid1=`docker run -d -v ${d}:/q -e VNC_PASSWORD=newPW -p 5900:5900 suchja/x11server` -cid2=`docker run -d --rm -i --link ${cid1}:xserver --volumes-from ${cid1} suchja/wine:latest /bin/bash` - -sleep 1 - -function kill_container { - tmp=`docker kill ${cid1} ${cid2}` -} -trap kill_container EXIT - -docker exec -it ${cid2} /bin/bash - - -inside the docker container prompt: - - export DISPLAY=xserver:0 - - wine wineboot --init - - cd ~/.wine/dosdevices/ - - ln -s /q "q:" - - wine msiexec /i q:\\dist\\windows\\python-2.7.13.msi /q - - wine q:\\dist\\windows\\pywin32-219.win32-py2.7.exe - - mkdir ~/.wine/drive_c/q-build-environment - - cp -r /q/dist/windows/PyInstaller-2.1 ~/.wine/drive_c/q-build-environment/ - - cd /q/dist - - wine q:\\dist\\windows\\nsis-2.46-setup.exe - install to c:\q-build-environment\nsis - - - wine c:\\python27\\python.exe c:\\q-build-environment\\PyInstaller-2.1\\pyinstaller.py -F --distpath=win_output --workpath=win_build q:\\bin\\q - - ### Don't forget to change the version in the command below: - - wine c:\\q-build-environment\\nsis\\makensis.exe -DVERSION=1.6.2.0 q:\\dist\\q-TextAsData-with-path.nsi - -run the installation file and check that the install works properly: - - wine setup.exe - -move the installation to the packages folder: - - mv /q/dist/setup.exe /q/packages/setup-q-<version>.exe - -exit from the docker container - - - diff --git a/dist/AddToPath.nsh b/dist/AddToPath.nsh deleted file mode 100644 index b961a1f..0000000 --- a/dist/AddToPath.nsh +++ /dev/null @@ -1,440 +0,0 @@ -!ifndef _AddToPath_nsh -!define _AddToPath_nsh - -!verbose 3 -!include "WinMessages.NSH" -!verbose 4 - -!ifndef WriteEnvStr_RegKey - !ifdef ALL_USERS - !define WriteEnvStr_RegKey \ - 'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"' - !else - !define WriteEnvStr_RegKey 'HKCU "Environment"' - !endif -!endif - -; AddToPath - Adds the given dir to the search path. -; Input - head of the stack -; Note - Win9x systems requires reboot - -Function AddToPath - Exch $0 - Push $1 - Push $2 - Push $3 - - # don't add if the path doesn't exist - IfFileExists "$0\*.*" "" AddToPath_done - - ReadEnvStr $1 PATH - Push "$1;" - Push "$0;" - Call StrStr - Pop $2 - StrCmp $2 "" "" AddToPath_done - Push "$1;" - Push "$0\;" - Call StrStr - Pop $2 - StrCmp $2 "" "" AddToPath_done - GetFullPathName /SHORT $3 $0 - Push "$1;" - Push "$3;" - Call StrStr - Pop $2 - StrCmp $2 "" "" AddToPath_done - Push "$1;" - Push "$3\;" - Call StrStr - Pop $2 - StrCmp $2 "" "" AddToPath_done - - Call IsNT - Pop $1 - StrCmp $1 1 AddToPath_NT - ; Not on NT - StrCpy $1 $WINDIR 2 - FileOpen $1 "$1\autoexec.bat" a - FileSeek $1 -1 END - FileReadByte $1 $2 - IntCmp $2 26 0 +2 +2 # DOS EOF - FileSeek $1 -1 END # write over EOF - FileWrite $1 "$\r$\nSET PATH=%PATH%;$3$\r$\n" - FileClose $1 - SetRebootFlag true - Goto AddToPath_done - - AddToPath_NT: - ReadRegStr $1 ${WriteEnvStr_RegKey} "PATH" - StrCmp $1 "" AddToPath_NTdoIt - Push $1 - Call Trim - Pop $1 - StrCpy $0 "$1;$0" - AddToPath_NTdoIt: - WriteRegExpandStr ${WriteEnvStr_RegKey} "PATH" $0 - SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000 - - AddToPath_done: - Pop $3 - Pop $2 - Pop $1 - Pop $0 -FunctionEnd - -; RemoveFromPath - Remove a given dir from the path -; Input: head of the stack - -Function un.RemoveFromPath - Exch $0 - Push $1 - Push $2 - Push $3 - Push $4 - Push $5 - Push $6 - - IntFmt $6 "%c" 26 # DOS EOF - - Call un.IsNT - Pop $1 - StrCmp $1 1 unRemoveFromPath_NT - ; Not on NT - StrCpy $1 $WINDIR 2 - FileOpen $1 "$1\autoexec.bat" r - GetTempFileName $4 - FileOpen $2 $4 w - GetFullPathName /SHORT $0 $0 - StrCpy $0 "SET PATH=%PATH%;$0" - Goto unRemoveFromPath_dosLoop - - unRemoveFromPath_dosLoop: - FileRead $1 $3 - StrCpy $5 $3 1 -1 # read last char - StrCmp $5 $6 0 +2 # if DOS EOF - StrCpy $3 $3 -1 # remove DOS EOF so we can compare - StrCmp $3 "$0$\r$\n" unRemoveFromPath_dosLoopRemoveLine - StrCmp $3 "$0$\n" unRemoveFromPath_dosLoopRemoveLine - StrCmp $3 "$0" unRemoveFromPath_dosLoopRemoveLine - StrCmp $3 "" unRemoveFromPath_dosLoopEnd - FileWrite $2 $3 - Goto unRemoveFromPath_dosLoop - unRemoveFromPath_dosLoopRemoveLine: - SetRebootFlag true - Goto unRemoveFromPath_dosLoop - - unRemoveFromPath_dosLoopEnd: - FileClose $2 - FileClose $1 - StrCpy $1 $WINDIR 2 - Delete "$1\autoexec.bat" - CopyFiles /SILENT $4 "$1\autoexec.bat" - Delete $4 - Goto unRemoveFromPath_done - - unRemoveFromPath_NT: - ReadRegStr $1 ${WriteEnvStr_RegKey} "PATH" - StrCpy $5 $1 1 -1 # copy last char - StrCmp $5 ";" +2 # if last char != ; - StrCpy $1 "$1;" # append ; - Push $1 - Push "$0;" - Call un.StrStr ; Find `$0;` in $1 - Pop $2 ; pos of our dir - StrCmp $2 "" unRemoveFromPath_done - ; else, it is in path - # $0 - path to add - # $1 - path var - StrLen $3 "$0;" - StrLen $4 $2 - StrCpy $5 $1 -$4 # $5 is now the part before the path to remove - StrCpy $6 $2 "" $3 # $6 is now the part after the path to remove - StrCpy $3 $5$6 - - StrCpy $5 $3 1 -1 # copy last char - StrCmp $5 ";" 0 +2 # if last char == ; - StrCpy $3 $3 -1 # remove last char - - WriteRegExpandStr ${WriteEnvStr_RegKey} "PATH" $3 - SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000 - - unRemoveFromPath_done: - Pop $6 - Pop $5 - Pop $4 - Pop $3 - Pop $2 - Pop $1 - Pop $0 -FunctionEnd - - - -; AddToEnvVar - Adds the given value to the given environment var -; Input - head of the stack $0 environement variable $1=value to add -; Note - Win9x systems requires reboot - -Function AddToEnvVar - - Exch $1 ; $1 has environment variable value - Exch - Exch $0 ; $0 has environment variable name - - DetailPrint "Adding $1 to $0" - Push $2 - Push $3 - Push $4 - - - ReadEnvStr $2 $0 - Push "$2;" - Push "$1;" - Call StrStr - Pop $3 - StrCmp $3 "" "" AddToEnvVar_done - - Push "$2;" - Push "$1\;" - Call StrStr - Pop $3 - StrCmp $3 "" "" AddToEnvVar_done - - - Call IsNT - Pop $2 - StrCmp $2 1 AddToEnvVar_NT - ; Not on NT - StrCpy $2 $WINDIR 2 - FileOpen $2 "$2\autoexec.bat" a - FileSeek $2 -1 END - FileReadByte $2 $3 - IntCmp $3 26 0 +2 +2 # DOS EOF - FileSeek $2 -1 END # write over EOF - FileWrite $2 "$\r$\nSET $0=%$0%;$4$\r$\n" - FileClose $2 - SetRebootFlag true - Goto AddToEnvVar_done - - AddToEnvVar_NT: - ReadRegStr $2 ${WriteEnvStr_RegKey} $0 - StrCpy $3 $2 1 -1 # copy last char - StrCmp $3 ";" 0 +2 # if last char == ; - StrCpy $2 $2 -1 # remove last char - StrCmp $2 "" AddToEnvVar_NTdoIt - StrCpy $1 "$2;$1" - AddToEnvVar_NTdoIt: - WriteRegExpandStr ${WriteEnvStr_RegKey} $0 $1 - SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000 - - AddToEnvVar_done: - Pop $4 - Pop $3 - Pop $2 - Pop $0 - Pop $1 - -FunctionEnd - -; RemoveFromEnvVar - Remove a given value from a environment var -; Input: head of the stack - -Function un.RemoveFromEnvVar - - Exch $1 ; $1 has environment variable value - Exch - Exch $0 ; $0 has environment variable name - - DetailPrint "Removing $1 from $0" - Push $2 - Push $3 - Push $4 - Push $5 - Push $6 - Push $7 - - IntFmt $7 "%c" 26 # DOS EOF - - Call un.IsNT - Pop $2 - StrCmp $2 1 unRemoveFromEnvVar_NT - ; Not on NT - StrCpy $2 $WINDIR 2 - FileOpen $2 "$2\autoexec.bat" r - GetTempFileName $5 - FileOpen $3 $5 w - GetFullPathName /SHORT $1 $1 - StrCpy $1 "SET $0=%$0%;$1" - Goto unRemoveFromEnvVar_dosLoop - - unRemoveFromEnvVar_dosLoop: - FileRead $2 $4 - StrCpy $6 $4 1 -1 # read last char - StrCmp $6 $7 0 +2 # if DOS EOF - StrCpy $4 $4 -1 # remove DOS EOF so we can compare - StrCmp $4 "$1$\r$\n" unRemoveFromEnvVar_dosLoopRemoveLine - StrCmp $4 "$1$\n" unRemoveFromEnvVar_dosLoopRemoveLine - StrCmp $4 "$1" unRemoveFromEnvVar_dosLoopRemoveLine - StrCmp $4 "" unRemoveFromEnvVar_dosLoopEnd - FileWrite $3 $4 - Goto unRemoveFromEnvVar_dosLoop - unRemoveFromEnvVar_dosLoopRemoveLine: - SetRebootFlag true - Goto unRemoveFromEnvVar_dosLoop - - unRemoveFromEnvVar_dosLoopEnd: - FileClose $3 - FileClose $2 - StrCpy $2 $WINDIR 2 - Delete "$2\autoexec.bat" - CopyFiles /SILENT $5 "$2\autoexec.bat" - Delete $5 - Goto unRemoveFromEnvVar_done - - unRemoveFromEnvVar_NT: - ReadRegStr $2 ${WriteEnvStr_RegKey} $0 - StrCpy $6 $2 1 -1 # copy last char - StrCmp $6 ";" +2 # if last char != ; - StrCpy $2 "$2;" # append ; - Push $2 - Push "$1;" - Call un.StrStr ; Find `$1;` in $2 - Pop $3 ; pos of our dir - StrCmp $3 "" unRemoveFromEnvVar_done - ; else, it is in path - # $1 - path to add - # $2 - path var - StrLen $4 "$1;" - StrLen $5 $3 - StrCpy $6 $2 -$5 # $6 is now the part before the path to remove - StrCpy $7 $3 "" $4 # $7 is now the part after the path to remove - StrCpy $4 $6$7 - - StrCpy $6 $4 1 -1 # copy last char - StrCmp $6 ";" 0 +2 # if last char == ; - StrCpy $4 $4 -1 # remove last char - - WriteRegExpandStr ${WriteEnvStr_RegKey} $0 $4 - - ; delete reg value if null - StrCmp $4 "" 0 +2 # if null delete reg - DeleteRegValue ${WriteEnvStr_RegKey} $0 - - SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000 - - unRemoveFromEnvVar_done: - Pop $7 - Pop $6 - Pop $5 - Pop $4 - Pop $3 - Pop $2 - Pop $1 - Pop $0 -FunctionEnd - - - - -!ifndef IsNT_KiCHiK -!define IsNT_KiCHiK - -########################################### -# Utility Functions # -########################################### - -; IsNT -; no input -; output, top of the stack = 1 if NT or 0 if not -; -; Usage: -; Call IsNT -; Pop $R0 -; ($R0 at this point is 1 or 0) - -!macro IsNT un -Function ${un}IsNT - Push $0 - ReadRegStr $0 HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion - StrCmp $0 "" 0 IsNT_yes - ; we are not NT. - Pop $0 - Push 0 - Return - - IsNT_yes: - ; NT!!! - Pop $0 - Push 1 -FunctionEnd -!macroend -!insertmacro IsNT "" -!insertmacro IsNT "un." - -!endif ; IsNT_KiCHiK - -; StrStr -; input, top of stack = string to search for -; top of stack-1 = string to search in -; output, top of stack (replaces with the portion of the string remaining) -; modifies no other variables. -; -; Usage: -; Push "this is a long ass string" -; Push "ass" -; Call StrStr -; Pop $R0 -; ($R0 at this point is "ass string") - -!macro StrStr un -Function ${un}StrStr -Exch $R1 ; st=haystack,old$R1, $R1=needle - Exch ; st=old$R1,haystack - Exch $R2 ; st=old$R1,old$R2, $R2=haystack - Push $R3 - Push $R4 - Push $R5 - StrLen $R3 $R1 - StrCpy $R4 0 - ; $R1=needle - ; $R2=haystack - ; $R3=len(needle) - ; $R4=cnt - ; $R5=tmp - loop: - StrCpy $R5 $R2 $R3 $R4 - StrCmp $R5 $R1 done - StrCmp $R5 "" done - IntOp $R4 $R4 + 1 - Goto loop -done: - StrCpy $R1 $R2 "" $R4 - Pop $R5 - Pop $R4 - Pop $R3 - Pop $R2 - Exch $R1 -FunctionEnd -!macroend -!insertmacro StrStr "" -!insertmacro StrStr "un." - -Function Trim ; Added by Pelaca - Exch $R1 - Push $R2 -Loop: - StrCpy $R2 "$R1" 1 -1 - StrCmp "$R2" " " RTrim - StrCmp "$R2" "$\n" RTrim - StrCmp "$R2" "$\r" RTrim - StrCmp "$R2" ";" RTrim - GoTo Done -RTrim: - StrCpy $R1 "$R1" -1 - Goto Loop -Done: - Pop $R2 - Exch $R1 -FunctionEnd - -!endif ; _AddToPath_nsh diff --git a/dist/create-deb b/dist/create-deb deleted file mode 100755 index 0017ff3..0000000 --- a/dist/create-deb +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -if [ $# -ne 1 ]; -then - echo 'create-deb <rpm-package-filename>' - exit 1 -fi - -command -v alien &>/dev/null || { echo >&2 "alien needs to be installed."; exit 1; } - -alien -d -k $1 diff --git a/dist/create-rpm b/dist/create-rpm deleted file mode 100755 index 697f112..0000000 --- a/dist/create-rpm +++ /dev/null @@ -1,63 +0,0 @@ -#!/bin/bash -x - -# -# Commit tag and Version number should be provided as input in the command line -# -# - -set -o pipefail - -if [ $# -ne 2 ]; -then - echo 'create-rpm <version> <based_on_tag>' - exit 1 -fi - -command -v ronn &>/dev/null || { echo >&2 "ronn needs to be installed."; exit 1; } -command -v rpmbuild &>/dev/null || { echo >&2 "rpmbuild needs to be installed."; exit 1; } - -set -e - -base_folder=`readlink -m $(dirname $0)` - -pushd ${base_folder} >/dev/null - -rpm_build_area=${base_folder}/rpm_build_area -rm -rf ${rpm_build_area:=/non-existent-dir} -mkdir -p ${rpm_build_area}/{SOURCES,SPECS,BUILD,RPMS,SRPMS,BUILDROOT} - -echo RPM build area is in ${rpm_build_area} - -VERSION=$1 -BASED_ON_TAG=$2 - -REAL_PACKAGE_NAME=q -RPM_PACKAGE_NAME=q-text-as-data - -FULL_NAME_FOLDER=${RPM_PACKAGE_NAME}-${VERSION} - -if [ ! -e ${RPM_PACKAGE_NAME}.spec.template ]; -then - echo "spec template does not exist. can't continue" - exit 1 -fi - -curl -f -o ${rpm_build_area}/SOURCES/q.tar.gz -L -R "https://github.com/harelba/q/tarball/$BASED_ON_TAG" -mkdir -p ${rpm_build_area}/SOURCES -pushd ${rpm_build_area}/SOURCES >/dev/null -tar xvzf ./q.tar.gz --strip-components=1 -rm -vf ./q.tar.gz - -mkdir ${rpm_build_area}/packages -cp /q/packages/q-x86_64-Linux ${rpm_build_area}/packages/q-x86_64-Linux - -# Expecting the binaries to exist in /packages/ - -popd >/dev/null -find ${rpm_build_area}/ -ls - -cat ${RPM_PACKAGE_NAME}.spec.template | sed "s/VERSION_PLACEHOLDER/$VERSION/g" > ${rpm_build_area}/SPECS/${RPM_PACKAGE_NAME}.spec - -rpmbuild -v --define "_topdir ${rpm_build_area}" -ba ${rpm_build_area}/SPECS/${RPM_PACKAGE_NAME}.spec - -popd >/dev/null diff --git a/dist/deb-builder-Dockerfile b/dist/deb-builder-Dockerfile deleted file mode 100644 index 7ff7b08..0000000 --- a/dist/deb-builder-Dockerfile +++ /dev/null @@ -1,8 +0,0 @@ - -FROM ubuntu:12.04 - -RUN apt-get update && apt-get install -y alien - -ENTRYPOINT "/bin/bash" - - diff --git a/dist/q-TextAsData-with-path.nsi b/dist/q-TextAsData-with-path.nsi deleted file mode 100644 index f2bec1e..0000000 --- a/dist/q-TextAsData-with-path.nsi +++ /dev/null @@ -1,182 +0,0 @@ -############################################################################################
-# NSIS Installation Script created by NSIS Quick Setup Script Generator v1.09.18
-# Entirely Edited with NullSoft Scriptable Installation System
-# by Vlasis K. Barkas aka Red Wine red_wine@freemail.gr Sep 2006
-############################################################################################
-
-!define APP_NAME "q-TextAsData"
-!define COMP_NAME "harelba"
-!define WEB_SITE "http://harelba.github.io/q/"
-# REQUIRED TO BE DEFINED EXTERNALLY !define VERSION "1.5.0.0"
-!define COPYRIGHT "Harel Ben-Attia @ 2012-2014"
-!define DESCRIPTION "Application"
-!define LICENSE_TXT "..\doc\LICENSE"
-!define INSTALLER_NAME "setup.exe"
-!define MAIN_APP_EXE "q.exe"
-!define INSTALL_TYPE "SetShellVarContext all"
-!define REG_ROOT "HKLM"
-!define REG_APP_PATH "Software\Microsoft\Windows\CurrentVersion\App Paths\${MAIN_APP_EXE}"
-!define UNINSTALL_PATH "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}"
-
-!ifndef VERSION
- Abort ; VERSION has to be defined externally
-!endif
-######################################################################
-
-VIProductVersion "${VERSION}"
-VIAddVersionKey "ProductName" "${APP_NAME}"
-VIAddVersionKey "CompanyName" "${COMP_NAME}"
-VIAddVersionKey "LegalCopyright" "${COPYRIGHT}"
-VIAddVersionKey "FileDescription" "${DESCRIPTION}"
-VIAddVersionKey "FileVersion" "${VERSION}"
-
-######################################################################
-
-SetCompressor ZLIB
-Name "${APP_NAME}"
-Caption "${APP_NAME}"
-OutFile "${INSTALLER_NAME}"
-BrandingText "${APP_NAME}"
-XPStyle on
-InstallDirRegKey "${REG_ROOT}" "${REG_APP_PATH}" ""
-InstallDir "$PROGRAMFILES\q-TextAsData"
-
-######################################################################
-
-!include "AddToPath.nsh"
-
-
-!include "MUI.nsh"
-
-!define MUI_ABORTWARNING
-!define MUI_UNABORTWARNING
-
-!insertmacro MUI_PAGE_WELCOME
-
-!ifdef LICENSE_TXT
-!insertmacro MUI_PAGE_LICENSE "${LICENSE_TXT}"
-!endif
-
-!ifdef REG_START_MENU
-!define MUI_STARTMENUPAGE_NODISABLE
-!define MUI_STARTMENUPAGE_DEFAULTFOLDER "q-TextAsData"
-!define MUI_STARTMENUPAGE_REGISTRY_ROOT "${REG_ROOT}"
-!define MUI_STARTMENUPAGE_REGISTRY_KEY "${UNINSTALL_PATH}"
-!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "${REG_START_MENU}"
-!insertmacro MUI_PAGE_STARTMENU Application $SM_Folder
-!endif
-
-!insertmacro MUI_PAGE_INSTFILES
-
-!insertmacro MUI_PAGE_FINISH
-
-!insertmacro MUI_UNPAGE_CONFIRM
-
-!insertmacro MUI_UNPAGE_INSTFILES
-
-!insertmacro MUI_UNPAGE_FINISH
-
-!insertmacro MUI_LANGUAGE "English"
-
-######################################################################
-
-Section -MainProgram
-${INSTALL_TYPE}
-SetOverwrite ifnewer
-SetOutPath "$INSTDIR"
-File "q:\dist\win_output\q.exe"
-
-Push $INSTDIR
-Call AddToPath
-SectionEnd
-
-######################################################################
-
-Section -Icons_Reg
-SetOutPath "$INSTDIR"
-WriteUninstaller "$INSTDIR\uninstall.exe"
-
-!ifdef REG_START_MENU
-!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
-CreateDirectory "$SMPROGRAMS\$SM_Folder"
-CreateShortCut "$SMPROGRAMS\$SM_Folder\${APP_NAME}.lnk" "$INSTDIR\${MAIN_APP_EXE}"
-!ifdef WEB_SITE
-WriteIniStr "$INSTDIR\${APP_NAME} website.url" "InternetShortcut" "URL" "${WEB_SITE}"
-CreateShortCut "$SMPROGRAMS\$SM_Folder\${APP_NAME} Website.lnk" "$INSTDIR\${APP_NAME} website.url"
-!endif
-!insertmacro MUI_STARTMENU_WRITE_END
-!endif
-
-!ifndef REG_START_MENU
-CreateDirectory "$SMPROGRAMS\q-TextAsData"
-CreateShortCut "$SMPROGRAMS\q-TextAsData\${APP_NAME}.lnk" "$INSTDIR\${MAIN_APP_EXE}"
-!ifdef WEB_SITE
-WriteIniStr "$INSTDIR\${APP_NAME} website.url" "InternetShortcut" "URL" "${WEB_SITE}"
-CreateShortCut "$SMPROGRAMS\q-TextAsData\${APP_NAME} Website.lnk" "$INSTDIR\${APP_NAME} website.url"
-!endif
-!endif
-
-CreateShortCut "$SMPROGRAMS\q-TextAsData\Uninstall ${APP_NAME}.lnk" "$INSTDIR\uninstall.exe"
-
-WriteRegStr ${REG_ROOT} "${REG_APP_PATH}" "" "$INSTDIR\${MAIN_APP_EXE}"
-WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}" "DisplayName" "${APP_NAME}"
-WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}" "UninstallString" "$INSTDIR\uninstall.exe"
-WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}" "DisplayIcon" "$INSTDIR\${MAIN_APP_EXE}"
-WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}" "DisplayVersion" "${VERSION}"
-WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}" "Publisher" "${COMP_NAME}"
-
-!ifdef WEB_SITE
-WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}" "URLInfoAbout" "${WEB_SITE}"
-!endif
-SectionEnd
-
-######################################################################
-
-Section Uninstall
-
-Push $INSTDIR
-Call un.RemoveFromPath
-
-${INSTALL_TYPE}
-Delete "$INSTDIR\select.pyd"
-Delete "$INSTDIR\unicodedata.pyd"
-Delete "$INSTDIR\library.zip"
-Delete "$INSTDIR\bz2.pyd"
-Delete "$INSTDIR\sqlite3.dll"
-Delete "$INSTDIR\q.exe"
-Delete "$INSTDIR\w9xpopen.exe"
-Delete "$INSTDIR\python27.dll"
-Delete "$INSTDIR\_sqlite3.pyd"
-Delete "$INSTDIR\_hashlib.pyd"
-
-
-Delete "$INSTDIR\uninstall.exe"
-!ifdef WEB_SITE
-Delete "$INSTDIR\${APP_NAME} website.url"
-!endif
-
-RmDir "$INSTDIR"
-
-!ifdef REG_START_MENU
-!insertmacro MUI_STARTMENU_GETFOLDER "Application" $SM_Folder
-Delete "$SMPROGRAMS\$SM_Folder\${APP_NAME}.lnk"
-!ifdef WEB_SITE
-Delete "$SMPROGRAMS\$SM_Folder\${APP_NAME} Website.lnk"
-!endif
-RmDir "$SMPROGRAMS\$SM_Folder"
-!endif
-
-!ifndef REG_START_MENU
-Delete "$SMPROGRAMS\q-TextAsData\${APP_NAME}.lnk"
-!ifdef WEB_SITE
-Delete "$SMPROGRAMS\q-TextAsData\${APP_NAME} Website.lnk"
-!endif
-RmDir "$SMPROGRAMS\q-TextAsData"
-!endif
-
-DeleteRegKey ${REG_ROOT} "${REG_APP_PATH}"
-DeleteRegKey ${REG_ROOT} "${UNINSTALL_PATH}"
-SectionEnd
-
-######################################################################
-
diff --git a/dist/q-text-as-data.spec.template b/dist/q-text-as-data.spec.template deleted file mode 100644 index 2be7cc2..0000000 --- a/dist/q-text-as-data.spec.template +++ /dev/null @@ -1,66 +0,0 @@ -%global _enable_debug_package 0 -%global debug_package %{nil} -%global __os_install_post %{nil} - -Name: q-text-as-data -Version: VERSION_PLACEHOLDER -Release: 1%{?dist} -Summary: q - Text as Data - -Group: Applications/Text -License: GPLv3 -URL: https://github.com/harelba/q -BuildArch: x86_64 - -%description -q allows to perform SQL-like statements on tabular text data. - - -%prep -cd %{_topdir}/BUILD -cp -vrf %{_topdir}/SOURCES/* %{_topdir}/BUILD/ -chmod -Rf a+rX,u+w,g-w,o-w %{_topdir}/BUILD/ -mkdir -p %{_topdir}/BUILD/packages/ -cp -vfr /q/packages/* %{_topdir}/BUILD/packages/ - -%build -cd %{_topdir}/BUILD -ronn doc/USAGE.markdown - -%install -rm -vrf ${RPM_BUILD_ROOT}/ -install -d -m 0755 ${RPM_BUILD_ROOT}%{_bindir} -install -d -m 0755 ${RPM_BUILD_ROOT}%{_datadir}/q-text-as-data -install -Dm 0644 ./packages/q-x86_64-Linux ${RPM_BUILD_ROOT}%{_datadir}/q-text-as-data/q -ln -s %{_datadir}/q-text-as-data/q ${RPM_BUILD_ROOT}%{_bindir}/q -install -d -m 0755 ${RPM_BUILD_ROOT}%{_mandir}/man1/ -install -m 0644 doc/USAGE ${RPM_BUILD_ROOT}%{_mandir}/man1/q.1 -gzip ${RPM_BUILD_ROOT}%{_mandir}/man1/q.1 - -%files -%defattr(-,root,root,-) -%{_bindir}/q -%doc README.markdown doc/AUTHORS doc/IMPLEMENTATION.markdown doc/LICENSE doc/RATIONALE.markdown doc/THANKS doc/USAGE.markdown -%attr(755,root,root) %{_datadir}/q-text-as-data/q -%{_datadir}/q-text-as-data -%doc %_mandir/man1/q.1.gz - -%changelog -*Wed Apr 05 2017 Harel Ben-Attia <harelba@gmail.com> 1.6.0-1 -- Moved RPM building to be dockerized -- Removed the need for providing commit hashes -*Fri Dec 12 2014 Harel Ben-Attia <harelba@gmail.com> 1.5.0-1 -- Moved stuff from create-rpm script into the rpm spec itself -*Sat Jun 14 2014 Harel Ben-Attia <harelba@gmail.com> 1.4.0-1 -- Changed RPM package name to q-text-as-data -- Fixed RPM creation logic after folder restructuring -- Man page is now taken directly from USAGE.markdown - -* Mon Mar 03 2014 Harel Ben-Attia <harelba@gmail.com> 1.3.0-1 -- Version 1.3.0 packaging - -* Thu Feb 20 2014 Harel Ben-Attia <harelba@gmail.com> 1.1.7-1 -- Added man page - -* Wed Feb 19 2014 Jens Neu <jens@zeeroos.de> 1.1.5-1 -- initial release diff --git a/dist/rpm-builder-Dockerfile b/dist/rpm-builder-Dockerfile deleted file mode 100644 index dafcd1e..0000000 --- a/dist/rpm-builder-Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ - -FROM centos:centos6 - -RUN yum install -y which curl gcc make rpm rpm-build - -RUN curl -sSL https://get.rvm.io | bash - -RUN /bin/bash -l -c "rvm install 2.4.1" && /bin/bash -l -c "gem install ronn" - -ENTRYPOINT "/bin/bash" - - diff --git a/dist/update-mac-homebrew-instructions b/dist/update-mac-homebrew-instructions deleted file mode 100644 index 0f3cf4d..0000000 --- a/dist/update-mac-homebrew-instructions +++ /dev/null @@ -1,51 +0,0 @@ - -Instructions to bump the version of q in homebrew - -1. Sync your fork with homebrew original fork - - git checkout master - - git pull upstream master - - git push origin master - -2. Create a branch for the version bump - - git checkout -b q<version-number> - -3. Edit the file Library/Formula/q.rb. - - a. Change the url to the new tar.gz file - - b. Change the sha256 checksum - - $ curl -sL "https://github.com/harelba/q/archive/<version>.tar.gz" | shasum -a 256 - <checksum> - - - $ Change the checksum in q.rb's "sha256" line to the new checksum - - c. Verify by running the following: - - $ brew fetch -s q - - The output should show the new SHA256 without any warning - -4. Check the diff - - git diff | vi - - -5. Commit the change as "q <version>" - -6. Push it as a separate branch to your repository: - - git push origin q<version-number> - |