Skip to content
This repository
Browse code

Packaging work

  • Loading branch information...
commit 1b7ed6fc033efd804a52c18dec83a9f1a540a19f 1 parent 28160b6
Bjarni R. Einarsson authored
1  Makefile
... ... @@ -1,4 +1,5 @@
1 1 # Makefile for building combined pagekite.py files.
  2 +PYTHONPATH := .
2 3
3 4 combined: pagekite tools dev
4 5 @./scripts/breeder.py socks.py \
1  pagekite/__main__.py
... ... @@ -1,3 +1,4 @@
  1 +#!/usr/bin/python
1 2 import sys
2 3 import pagekite as pk
3 4 import pagekite.httpd as httpd
3  pk
... ... @@ -1,3 +0,0 @@
1   -#!/bin/bash
2   -export PYTHONPATH=.
3   -exec python pagekite/__main__.py "$@"
1  pk
5 scripts/blackbox-test.sh
@@ -2,6 +2,7 @@
2 2 #
3 3 # Primitive black-box test for pagekite.py
4 4 #
  5 +export PYTHONPATH=.:$PYTHONPATH
5 6 export PATH=.:$PATH
6 7 export http_proxy=
7 8
@@ -53,7 +54,7 @@ __TEST__ "Basic FE/BE/HTTPD setup" "$LOG-1" "$LOG-2" "$LOG-3" "$LOG-4"
53 54 [ "$HAVE_TLS" = "" ] || FE_ARGS="$FE_ARGS --tls_endpoint=testing:$0 \
54 55 --tls_default=testing"
55 56 $PK $FE_ARGS --settings >$LOG-1
56   - $PK $FE_ARGS --logfile=stdio >>$LOG-1 2>&1 &
  57 + ($PK $FE_ARGS --logfile=stdio) >>$LOG-1 2>&1 &
57 58 KID_FE=$!
58 59 __logwait $LOG-1 listen=:$PORT || __TEST_FAIL__ 'setup:FE' $KID_FE
59 60
@@ -62,7 +63,7 @@ __logwait $LOG-1 listen=:$PORT || __TEST_FAIL__ 'setup:FE' $KID_FE
62 63 [ "$HAVE_TLS" = "" ] || BE_ARGS1="$BE_ARGS1 --fe_certname=testing"
63 64 BE_ARGS2="/etc/passwd $LOG-4 http://testing/"
64 65 $PK $BE_ARGS1 --settings $BE_ARGS2 >$LOG-2
65   - $PK $BE_ARGS1 --logfile=stdio $BE_ARGS2 >>$LOG-2 2>&1 &
  66 + ($PK $BE_ARGS1 --logfile=stdio $BE_ARGS2) >>$LOG-2 2>&1 &
66 67 KID_BE=$!
67 68 __logwait $LOG-2 connect= || __TEST_FAIL__ 'setup:BE' $KID_FE $KID_BE
68 69
1  setup.py
@@ -31,4 +31,5 @@
31 31 to clients supporting HTTP Proxies.
32 32 """,
33 33 packages=['pagekite'],
  34 + scripts=['scripts/pagekite.py'],
34 35 )

0 comments on commit 1b7ed6f

Please sign in to comment.
Something went wrong with that request. Please try again.