Changeset 18729f8 in adblock2privoxy


Ignore:
Timestamp:
Jan 6, 2015 12:35:12 AM (5 years ago)
Author:
zubr <a@…>
Branches:
master
Children:
126bdbc
Parents:
caed8ed
Message:

Release preparation

Files:
2 added
1 deleted
10 edited

Legend:

Unmodified
Added
Removed
  • adblock2privoxy-utils/automation/build_all.sh

    r828fba4 r18729f8  
    22 
    33parallel ::: \ 
    4 './run_aws_build.sh ami-1eb35469 fedora make_rpm "distribution/rpmbuild/RPMS" fedora20_64' \ 
    5 './run_aws_build.sh ami-0bac577c fedora make_rpm "distribution/rpmbuild/RPMS" fedora20_i386'  
     4'./run_aws_build.sh ami-1eb35469 fedora makeFedoraRpm fedora20_64' \ 
     5'./run_aws_build.sh ami-0bac577c fedora makeFedoraRpm fedora20_i386'  
  • adblock2privoxy-utils/automation/run_aws_build.sh

    rb4685e7 r18729f8  
    55USER=$2 
    66COMMAND=$3 
    7 RESULT_PATH=$4 
    8 BUILD_ID=$5 
     7BUILD_ID=$4 
    98 
    109echo "build started, see $BUILD_ID/build.log for result" 
     
    1918--key-name ab2p \ 
    2019--security-groups launch-wizard-2 \ 
    21 --instance-type m3.medium \ 
     20--instance-type c1.medium \ 
    2221--block-device-mappings '[{"DeviceName": "/dev/sda1","Ebs": {"VolumeSize": 10,"DeleteOnTermination": true,"VolumeType": "standard"}}]' \ 
    2322| sed -n -r '/InstanceId/ {s/.*:\s"([[:alnum:]-]+)".*/\1/;p}') 
     
    4645echo "Upload files" 
    4746sftp -i ~/.ssh/ab2p.pem -o "IdentitiesOnly yes" -o "StrictHostKeyChecking no" $USER@$INSTANCE_IP<<END 
    48 mkdir distribution 
    49 put -r . distribution 
    50 put ../adblock2privoxy.cabal 
     47mkdir adblock2privoxy 
     48put -r ../../adblock2privoxy 
    5149exit 
    5250END 
     
    5452echo "Run build with $COMMAND" 
    5553ssh -t -t -i ~/.ssh/ab2p.pem -o "IdentitiesOnly yes" -o "StrictHostKeyChecking no" $USER@$INSTANCE_IP<<END 
    56 cd distribution 
     54cd adblock2privoxy/distribution 
    5755./$COMMAND.sh | tee build.log 
    5856exit 
     
    6159echo "Download result from $RESULT_PATH" 
    6260sftp -i ~/.ssh/ab2p.pem -o "IdentitiesOnly yes" -o "StrictHostKeyChecking no" $USER@$INSTANCE_IP<<END 
    63 get -r $RESULT_PATH $BUILD_ID 
     61get -r adblock2privoxy/distribution/binary/* $BUILD_ID 
    6462exit 
    6563END 
    6664 
     65echo "Upload result to s3" 
     66aws s3 cp $BUILD_ID/adblock2privoxy* s3://ab2p/ 
     67 
     68 
    6769echo "Terminate instance" 
    6870aws ec2 terminate-instances --instance-ids "$INSTANCE_ID" 
  • adblock2privoxy-utils/launches/adblock2privoxy (run web).launch

    rff7ee56 r18729f8  
    11<?xml version="1.0" encoding="UTF-8" standalone="no"?> 
    22<launchConfiguration type="net.sf.eclipsefp.haskell.debug.core.internal.launch.ExecutableHaskellLaunchDelegate"> 
    3 <stringAttribute key="EXTRA_ARGUMENTS" value="-p ../.out/privoxy -w ../.out/web https://easylist-downloads.adblockplus.org/easylist.txt https://easylist-downloads.adblockplus.org/easyprivacy.txt https://easylist-downloads.adblockplus.org/advblock.txt https://easylist-downloads.adblockplus.org/bitblock.txt https://easylist-downloads.adblockplus.org/cntblock.txt"/> 
     3<stringAttribute key="EXTRA_ARGUMENTS" value="-p ../.out/privoxy -w ../.out/web -d www.example.com https://easylist-downloads.adblockplus.org/easylist.txt https://easylist-downloads.adblockplus.org/easyprivacy.txt https://easylist-downloads.adblockplus.org/advblock.txt https://easylist-downloads.adblockplus.org/bitblock.txt https://easylist-downloads.adblockplus.org/cntblock.txt"/> 
    44<stringAttribute key="PROJECT_NAME" value="adblock2privoxy"/> 
    55<stringAttribute key="STANZA" value="adblock2privoxy"/> 
  • adblock2privoxy-utils/src/RpmSpec.hs

    rb4685e7 r18729f8  
    6464        ## "%install" 
    6565        ## "%ghc_bin_install" 
     66        ## "cp -r man %{buildroot}%{_mandir}"  
    6667        ## "" 
    6768        ## "" 
    6869        ## "%files" 
     70        ## "%doc %{_mandir}" 
    6971        ## "%doc " # (unwords <$> licenseFiles) # " "  
    70                    # (unwords <$> filter (not.startswith "distribution") . extraSrcFiles) 
     72                   # (unwords <$> filter (not.startswith "man")  
     73                                 .filter (not.startswith "distribution")  
     74                                 . extraSrcFiles) 
    7175        ## "%{_bindir}/%{name}" 
    7276        ## "%{_datadir}/%{name}-%{version}" 
  • adblock2privoxy/INSTALL.rst

    rff7ee56 r18729f8  
    26264. Run::  
    2727 
     28        cabal update 
    2829        runhaskell Setup.hs configure --user 
    2930        runhaskell Setup.hs build 
  • adblock2privoxy/adblock2privoxy.cabal

    rb4685e7 r18729f8  
    11name:                adblock2privoxy 
    2 version:             1.3.0 
     2version:             1.3.1 
    33cabal-version:       >= 1.10 
    44build-type:          Simple 
     
    8787                   PolicyTree, 
    8888                   PopupBlocker, 
     89                   ProgramOptions, 
    8990                   SourceInfo, 
    9091                   Statistics, 
     
    9899  location:  ​http://projects.zubr.me/adblock2privoxy.git 
    99100  subdir:    adblock2privoxy 
    100   tag:       1.3.0 
     101  tag:       1.3.1 
  • adblock2privoxy/distribution/buildWin.bat

    rb4685e7 r18729f8  
    88MKDIR binary\adblock2privoxy 
    99CD .. 
     10cabal update 
    1011runhaskell Setup.hs configure --user --prefix=%cd%\distribution\binary\adblock2privoxy 
    1112runhaskell Setup.hs build 
  • adblock2privoxy/distribution/makeFedoraRpm.sh

    rb4685e7 r18729f8  
    55echo "create build folders" 
    66mkdir -p rpmbuild/BUILD 
    7 ln -s ../../.. rpmbuild/BUILD/root 
     7ln -nsf ../../.. rpmbuild/BUILD/root 
    88mkdir -p rpmbuild/BUILDROOT 
    99mkdir -p rpmbuild/RPMS 
     
    1212sudo yum -y install @development-tools 
    1313sudo yum -y install fedora-packager 
    14 sudo yum -y install alien 
    15 sudo yum -y install dpkg-dev 
     14#sudo yum -y install alien 
     15#sudo yum -y install dpkg-dev 
    1616sudo yum-builddep -y rpmbuild/SPECS/adblock2privoxy.spec 
    1717 
     
    2323cd binary 
    2424 
    25 echo "convert to DEB" 
    26 sudo alien * 
     25#echo "convert to DEB" 
     26#sudo alien * 
    2727 
    2828echo Build is done. The result is in current folder 
  • adblock2privoxy/distribution/rpmbuild/SPECS/adblock2privoxy.spec

    rcaed8ed r18729f8  
    11Name:    adblock2privoxy 
    2 Version: 1.3.0 
     2Version: 1.3.1 
    33Release: 1%{?dist} 
    44Summary: Convert adblock config files to privoxy format 
     
    66License: GPL-3 
    77URL:     https://projects.zubr.me/wiki/adblock2privoxy 
    8 Source0: http://hackage.haskell.org/package/adblock2privoxy-1.3.0/adblock2privoxy-1.3.0.tar.gz 
     8Source0: http://hackage.haskell.org/package/adblock2privoxy-1.3.1/adblock2privoxy-1.3.1.tar.gz 
    99Vendor:  Alexey Zubritskiy <adblock2privoxy@zubr.me> 
    1010Group:   Web 
     
    5757%install 
    5858%ghc_bin_install 
     59cp -r man %{buildroot}%{_mandir} 
    5960 
    6061 
    6162%files 
    62 %doc LICENSE README.rst INSTALL.rst changelog man/man1/adblock2privoxy.1 
     63%doc %{_mandir} 
     64%doc LICENSE README.rst INSTALL.rst changelog 
    6365%{_bindir}/%{name} 
    6466%{_datadir}/%{name}-%{version} 
     
    6668 
    6769%changelog 
    68 * Sat Jan 03 2015 Alexey Zubritskiy <adblock2privoxy@zubr.me> - 1.3.0 
     70* Mon Jan 05 2015 Alexey Zubritskiy <adblock2privoxy@zubr.me> - 1.3.1 
    6971- Rpm release for new version (generated from cabal file) 
  • adblock2privoxy/man/man1/adblock2privoxy.1

    rcaed8ed r18729f8  
    1 .TH "ADBLOCK2PRIVOXY" "1" "2015\-01\-03" "adblock2privoxy 1.3.0" "General Commands Manual" 
     1.TH "ADBLOCK2PRIVOXY" "1" "2015\-01\-05" "adblock2privoxy 1.3.1" "General Commands Manual" 
    22.SH ADBLOCK2PRIVOXY 
    33.PP 
Note: See TracChangeset for help on using the changeset viewer.