libraries/proxyface
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

adapted to new improved build system

Browse Source
This commit is contained in:
Marc Wäckerlin
2015-03-15 14:22:35 +00:00
parent 6b1bdb8d85
commit 40cc025971
32 changed files with 1555 additions and 2308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
src/makefile.am
View File

@@ -1,58 +1,32 @@
## @file
##
## $Id$
##
## @id $Id$
#
# This file has been added by bootstrap.sh on Sun, 15 Mar 2015 09:18:56 +0100
# Feel free to change it or even remove and rebuild it, up to your needs
#
## 1 2 3 4 5 6 7 8
## 45678901234567890123456789012345678901234567890123456789012345678901234567890
if HAVE_QT
UISOURCES = proxyface/proxy.ui proxyface/proxyauth.ui
RESOURCES = proxyface/resources.cxx
MOCHEADER = proxyface/proxy.hxx proxyface/autoproxy.hxx proxyface/proxyauth.hxx
LANGUAGES = proxy_de.qm proxy_en.qm proxy_fr.qm proxy_it.qm
LANG_TS = proxy_de.ts proxy_en.ts proxy_fr.ts proxy_it.ts
UIHEADER = proxyface/ui_proxy.hxx proxyface/ui_proxyauth.hxx
MOCSOURCES = proxyface/moc_proxy.cxx proxyface/moc_autoproxy.cxx proxyface/moc_proxyauth.cxx
endif
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = @PACKAGENAME@.pc
pkgconfig2dir = $(datarootdir)/pkgconfig
pkgconfig2_DATA = $(pkgconfig_DATA)
pkgdata_DATA = ${LANGUAGES}
EXTRA_DIST = ${UISOURCES} $(pkgconfig_DATA).in version.cxx.in
BUILT_SOURCES = ${UIHEADER} ${MOCSOURCES} ${LANGUAGES} ${RESOURCES} version.cxx
proxyfacedir = ${includedir}/proxyface
proxyface_HEADERS = proxyface/unix.hxx proxyface/windoze.hxx \
proxyface/qtproxy.hxx \
${MOCHEADER} ${UIHEADER}
lib_LTLIBRARIES = libproxyface.la
libproxyface_la_SOURCES = ${MOCSOURCES} ${LANGUAGES} ${RESOURCES} version.cxx
libproxyface_la_LDFLAGS = -version-info ${LIB_VERSION}
proxyfacedir = ${includedir}/proxyface
proxyface_HEADERS = proxyface/autoproxy.hxx proxyface/proxy.hxx \
proxyface/unix.hxx proxyface/proxyauth.hxx \
proxyface/qtproxy.hxx proxyface/windoze.hxx \
${libproxyface_la_UIFILES}
rebuild-ts: ${LANG_TS}
%.cxx: %.qrc
${RCC} -o $@ $<
moc_%.cxx: %.hxx
${MOC} -DMOC ${CPPFLAGS} -o $@ $<
ui_%.hxx: %.ui
${UIC} -o $@ $<
%.ts: ${UISOURCES} ${MOCHEADER} ${proxyface_HEADERS}
${LUPDATE} ${LUPDATE_ARGS} $^ -ts $@
%.qm: %.ts
${LRELEASE} $< -qm $@
CLEANFILES = ${UIHEADER} ${MOCSOURCES}
DISTCLEANFILES = $(pkgconfig_DATA)
MAINTAINERCLEANFILES = makefile.in
if HAVE_QT
libproxyface_la_UIFILES = proxyface/ui_proxy.hxx \
proxyface/ui_proxyauth.hxx
libproxyface_la_MOCFILES = proxyface/moc_proxy.cxx \
proxyface/moc_autoproxy.cxx \
proxyface/moc_proxyauth.cxx
libproxyface_la_RCCFILES = proxyface/qrc_resources.cxx
BUILT_SOURCES = ${libproxyface_la_UIFILES} \
${libproxyface_la_MOCFILES} \
${libproxyface_la_RCCFILES}
# EXTRA_DIST = ${libproxyface_la_UIFILES:proxyface/ui_%.hxx=proxyface/%.ui} \
# ${libproxyface_la_MOCFILES:proxyface/rcc_%.cxx=proxyface/%.hxx} \
# ${libproxyface_la_RCCFILES:proxyface/rcc_%.cxx=proxyface/%.rcc}
endif
libproxyface_la_SOURCES = version.cxx ${libproxyface_la_RCCFILES} \
${libproxyface_la_MOCFILES}

25
src/proxyface.pc.in
View File

@@ -1,11 +1,18 @@
prefix=@PACKAGENAME@
exec_prefix=${prefix}
libdir=${exec_prefix}/lib
includedir=${prefix}/include
## @id $Id$
#
# This file has been added by bootstrap.sh on Sun, 15 Mar 2015 09:18:56 +0100
# Feel free to change it or even remove and rebuild it, up to your needs
#
## 1 2 3 4 5 6 7 8
## 45678901234567890123456789012345678901234567890123456789012345678901234567890
Name: @PACKAGENAME@
Description: C++/Qt/libproxy/WinHTTP GUI/WPAD Proxy Interface
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=/lib
includedir=/include
Name: @PACKAGE_NAME@
Description: @DESCRIPTION@
Version: @VERSION@
Libs: -L${libdir} -lproxyface
Libs.private:
Cflags: -I${includedir}
Libs: -L -l@PACKAGE_NAME@ @LDFLAGS@
Cflags: -I @CPPFLAGS@

20
src/proxyface/autoproxy.hxx
View File

@@ -8,7 +8,7 @@
#ifndef PROXYFACE_HXX
#define PROXYFACE_HXX
#ifdef QT_NETWORK_LIB
#if HAVE_QT == 1
#include <QtNetwork/QNetworkProxy>
#include <QtNetwork/QNetworkAccessManager>
#include <QtNetwork/QNetworkReply>
@@ -192,15 +192,15 @@ namespace proxy {
@example getproxylist.cxx */
class Interface
#ifdef QT_NETWORK_LIB
#ifdef Q_OS_WIN32
#if HAVE_QT == 1
# ifdef Q_OS_WIN32
: public QObject
#else
# else
: public QThread
#endif
# endif
#endif
{
#ifdef QT_NETWORK_LIB
#if HAVE_QT == 1
Q_OBJECT
#endif
@@ -208,11 +208,11 @@ namespace proxy {
//! Keep your instance as long as possible, because of caching.
Interface()
#ifdef QT_NETWORK_LIB
#if HAVE_QT == 1
: _timeout1Paused(false), _timeout2Paused(false)
#endif
{
#ifdef QT_NETWORK_LIB
#if HAVE_QT == 1
PROXYFACE_LOG;
if (!connect(&_timeout1, SIGNAL(timeout()), SLOT(timeout())))
qFatal("connect failed");
@@ -229,7 +229,7 @@ namespace proxy {
//! Get list of proxies for a given URL.
virtual List proxies(const std::string& url) = 0;
#ifdef QT_NETWORK_LIB
#if HAVE_QT == 1
//! Reset, stop all outstanding checks
void reset() {
_timeout1.stop();
@@ -575,7 +575,7 @@ namespace proxy {
}
# endif
# else
# if defined(QT_NETWORK_LIB) && defined(Q_OS_MAC)
# if HAVE_QT == 1
// use Qt if available (not yet linux)
# include <proxyface/qtproxy.hxx>
namespace proxy {

2
src/proxyface/unix.hxx
View File

@@ -8,6 +8,7 @@
#ifndef PROXY_LINUX
#define PROXY_LINUX
#ifdef HAVE_PROXY
extern "C" {
#include <proxy.h>
}
@@ -60,3 +61,4 @@ namespace proxy {
}
#endif
#endif

6
src/version.cxx.in → src/version.cxx
View File

@@ -10,8 +10,8 @@
namespace proxy {
std::string version() {
return "@PACKAGENAME@-@VERSION@";
return PACKAGE_NAME "-" PACKAGE_VERSION;
}
const std::string WHAT("#(@) @PACKAGENAME@-@VERSION@");
const std::string IDENT("$Id: @PACKAGENAME@-@VERSION@ $");
const std::string WHAT("#(@) " PACKAGE_NAME "-" PACKAGE_VERSION);
const std::string IDENT("$Id: " PACKAGE_NAME "-" PACKAGE_VERSION " $");
}