From 870f842909963dee7573d1ce55ded21d33f4a368 Mon Sep 17 00:00:00 2001 From: gregory guy Date: Tue, 17 Nov 2020 16:09:59 +0100 Subject: [PATCH] Drop tqmake build support. Add basic cmake build instructions. Rework of the README file. Signed-off-by: gregory guy --- INSTALL | 24 ++- README | 24 +-- configure | 499 ------------------------------------------------------ qca.pro | 33 ---- qca.qc | 5 - qcextra | 13 -- 6 files changed, 29 insertions(+), 569 deletions(-) delete mode 100755 configure delete mode 100644 qca.pro delete mode 100644 qca.qc delete mode 100755 qcextra diff --git a/INSTALL b/INSTALL index 8dd3409..c42fedd 100644 --- a/INSTALL +++ b/INSTALL @@ -1,12 +1,18 @@ -Installing QCA --------------- +Basic Installation +================== -Installation should be straightforward: +tqca relies on cmake to build. - ./configure - make - make install +Here are suggested default options: -NOTE: You may also need to run '/sbin/ldconfig' or a similar tool to - get the new library files recognized by the system. If you are - using Linux, just run it for good measure. + -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DWITH_ALL_OPTIONS="ON" + + +Requirements: +============= + +- tqtinterface diff --git a/README b/README index 2a7f471..f33c56b 100644 --- a/README +++ b/README @@ -1,8 +1,6 @@ -TQt Cryptographic Architecture ------------------------------ -Version: API v1.0, Plugin v1 -Author: Justin Karneges -Date: September 10th 2003 + + tqca - the TQt Cryptographic Architecture + This library provides an easy API for the following features: @@ -13,17 +11,23 @@ This library provides an easy API for the following features: Hashing (SHA1, MD5) Ciphers (BlowFish, 3DES, AES) -Functionality is supplied via plugins. This is useful for avoiding +Functionality is supplied via plugins. This is useful for avoiding dependence on a particular crypto library and makes upgrading easier, as there is no need to recompile your application when adding or upgrading a crypto plugin. Also, by pushing crypto functionality into plugins, your application is free of legal issues, such as export regulation. -And of course, you get a very simple crypto API for TQt, where you can -do things like: - TQString hash = QCA::SHA1::hashToString(blockOfData); -Have fun! +CONTRIBUTING +============== + +If you wish to contribute to tqca, you might do so: + +- TDE Gitea Workspace (TGW) collaboration tool. + https://mirror.git.trinitydesktop.org/gitea + +- TDE Weblate Translation Workspace (TWTW) collaboration tool. + https://mirror.git.trinitydesktop.org/weblate diff --git a/configure b/configure deleted file mode 100755 index 2ffc45b..0000000 --- a/configure +++ /dev/null @@ -1,499 +0,0 @@ -#!/bin/sh - -show_usage() { -cat <$1/modules.cpp <$1/modules_new.cpp <$1/conf.cpp < -#include -#include -#include -#include -#include -#include -#include -#include - -class Conf; - -class ConfObj -{ -public: - ConfObj(Conf *c); - virtual ~ConfObj(); - - virtual TQString name() const=0; - virtual TQString shortname() const=0; - virtual bool exec()=0; - - Conf *conf; - bool required; - bool disabled; -}; - -typedef TQPtrList ConfObjList; -typedef TQPtrListIterator ConfObjListIt; - -class Conf -{ -public: - Conf() : vars(17) - { - list.setAutoDelete(true); - vars.setAutoDelete(true); - - vars.insert("QMAKE_INCDIR_X11", new TQString(X11_INC)); - vars.insert("QMAKE_LIBDIR_X11", new TQString(X11_LIBDIR)); - vars.insert("QMAKE_LIBS_X11", new TQString(X11_LIB)); - vars.insert("QMAKE_CC", new TQString(CC)); - } - - ~Conf() - { - } - - void added(ConfObj *o) - { - list.append(o); - } - - TQString getenv(const TQString &var) - { - char *p = ::getenv(var.latin1()); - if(!p) - return TQString::null; - return TQString(p); - } - - bool exec() - { - ConfObjListIt it(list); - for(ConfObj *o; (o = it.current()); ++it) { - // if this was a disabled-by-default option, check if it was enabled - if(o->disabled) { - TQString v = TQString("QC_ENABLE_") + o->shortname(); - if(getenv(v) != "Y") - continue; - } - // and the opposite? - else { - TQString v = TQString("QC_DISABLE_") + o->shortname(); - if(getenv(v) == "Y") - continue; - } - - printf("Checking for %s ...", o->name().latin1()); - fflush(stdout); - bool ok = o->exec(); - if(ok) - printf(" yes\n"); - else - printf(" no\n"); - if(!ok && o->required) { - printf("\nError: need %s!\n", o->name().latin1()); - return false; - } - } - return true; - } - - const TQString & qvar(const TQString &s) - { - TQString *p = vars.find(s); - if(p) - return *p; - else - return blank; - } - - TQString expandIncludes(const TQString &inc) - { - return TQString("-I") + inc; - } - - TQString expandLibs(const TQString &lib) - { - return TQString("-L") + lib; - } - - int doCommand(const TQString &s) - { - //printf("[%s]\n", s.latin1()); - int r = system((s + " 1>/dev/null 2>/dev/null").latin1()); - //printf("returned: %d\n", r); - return r; - } - - bool doCompileAndLink(const TQString &filedata, const TQString &flags, int *retcode=0) - { - TQDir dir("."); - TQString fname = "atest.c"; - TQString out = "atest"; - TQFile f(fname); - TQCString cs = filedata.latin1(); - if(!f.open(IO_WriteOnly | IO_Truncate)) - return false; - f.writeBlock(cs.data(), cs.length()); - f.close(); - - TQString str = qvar("QMAKE_CC") + ' ' + fname + " -o " + out + ' ' + flags; - int r = doCommand(str); - if(r == 0 && retcode) - *retcode = doCommand(TQString("./") + out); - dir.remove(fname); - dir.remove(out); - if(r != 0) - return false; - return true; - } - - bool checkHeader(const TQString &path, const TQString &h) - { - TQFileInfo fi(path + '/' + h); - if(fi.exists()) - return true; - return false; - } - - bool findHeader(const TQString &h, const TQStringList &ext, TQString *inc) - { - if(checkHeader("/usr/include", h)) { - *inc = ""; - return true; - } - TQStringList dirs; - dirs += "/usr/local/include"; - dirs += ext; - for(TQStringList::ConstIterator it = dirs.begin(); it != dirs.end(); ++it) { - if(checkHeader(*it, h)) { - *inc = *it; - return true; - } - } - return false; - } - - bool checkLibrary(const TQString &path, const TQString &name) - { - TQString str = - "int main()\n" - "{\n" - " return 0;\n" - "}\n"; - - TQString extra; - if(!path.isEmpty()) - extra += TQString("-L") + path + ' '; - extra += TQString("-l") + name; - if(!doCompileAndLink(str, extra)) - return false; - return true; - } - - bool findLibrary(const TQString &name, TQString *lib) - { - if(checkLibrary("", name)) { - *lib = ""; - return true; - } - if(checkLibrary("/usr/local/lib", name)) { - *lib = "/usr/local/lib"; - return true; - } - if(checkLibrary("/usr/local/lib64", name)) { - *lib = "/usr/local/lib64"; - return true; - } - return false; - } - - void addDefine(const TQString &str) - { - if(DEFINES.isEmpty()) - DEFINES = str; - else - DEFINES += TQString(" ") + str; - } - - void addLib(const TQString &str) - { - if(LIBS.isEmpty()) - LIBS = str; - else - LIBS += TQString(" ") + str; - } - - void addIncludePath(const TQString &str) - { - if(INCLUDEPATH.isEmpty()) - INCLUDEPATH = str; - else - INCLUDEPATH += TQString(" ") + str; - } - - void addExtra(const TQString &str) - { - extra += str + '\n'; - } - - TQString DEFINES; - TQString INCLUDEPATH; - TQString LIBS; - TQString extra; - -private: - ConfObjList list; - TQDict vars; - TQString blank; -}; - -ConfObj::ConfObj(Conf *c) -{ - conf = c; - conf->added(this); - required = false; - disabled = false; -} - -ConfObj::~ConfObj() -{ -} - -#include"modules.cpp" - -//---------------------------------------------------------------------------- -// main -//---------------------------------------------------------------------------- -int main() -{ - Conf *conf = new Conf; - ConfObj *o; - o = 0; -#include"modules_new.cpp" - - printf("ok\n"); - bool success = false; - if(conf->exec()) { - TQFile f("conf.pri"); - if(!f.open(IO_WriteOnly | IO_Truncate)) { - printf("Error writing %s\n", f.name().latin1()); - return 1; - } - - TQString str; - str += "# qconf\n"; - str += "QT_PATH_PLUGINS = " + TQString(tqInstallPathPlugins()) + '\n'; - if(!conf->DEFINES.isEmpty()) - str += "DEFINES += " + conf->DEFINES + '\n'; - if(!conf->INCLUDEPATH.isEmpty()) - str += "INCLUDEPATH += " + conf->INCLUDEPATH + '\n'; - if(!conf->LIBS.isEmpty()) - str += "LIBS += " + conf->LIBS + '\n'; - if(!conf->extra.isEmpty()) - str += conf->extra; - str += '\n'; - - char *p = getenv("BINDIR"); - if(p) { - str += TQString("target.path = ") + p + '\n'; - str += "INSTALLS += target\n"; - } - - TQCString cs = str.latin1(); - f.writeBlock(cs.data(), cs.length()); - f.close(); - success = true; - } - delete conf; - - if(success) - return 0; - else - return 1; -} - -EOT -cat >$1/conf.pro </dev/null - TQTDIR=$TQTDIR make clean >/dev/null 2>&1 - TQTDIR=$TQTDIR make >../conf.log 2>&1 -) - -if [ "$?" != "0" ]; then - rm -rf .qconftemp - echo fail - echo - echo "There was an error compiling 'conf'. Be sure you have a proper" - echo "TQt 3.x Multithreaded (MT) build environment set up." - if [ ! -f "$TQTDIR/lib/libtqt-mt.so.3" ]; then - if [ ! -f "$TQTDIR/lib64/libtqt-mt.so.3" ]; then - echo - echo "One possible reason is that you don't have" - echo "libtqt-mt.so.3 installed in $TQTDIR/lib/" - echo "or $TQTDIR/lib64/." - fi - fi - echo - exit 1; -fi - -.qconftemp/conf -ret="$?" -if [ "$ret" = "1" ]; then - rm -rf .qconftemp - echo - exit 1; -else - if [ "$ret" != "0" ]; then - rm -rf .qconftemp - echo fail - echo - echo Unexpected error launching 'conf' - echo - exit 1; - fi -fi -rm -rf .qconftemp - -if [ -x "./qcextra" ]; then - ./qcextra -fi -# run tqmake -$qm qca.pro -if [ "$?" != "0" ]; then - echo - exit 1; -fi -cat >Makefile.tmp <> Makefile.tmp -rm -f Makefile -cp -f Makefile.tmp Makefile -rm -f Makefile.tmp - -echo -echo Good, your configure finished. Now run \'make\'. -echo diff --git a/qca.pro b/qca.pro deleted file mode 100644 index 1aa5c87..0000000 --- a/qca.pro +++ /dev/null @@ -1,33 +0,0 @@ -# qca qmake profile - -TEMPLATE = lib -CONFIG += qt thread release -TARGET = qca - -MOC_DIR = .moc -OBJECTS_DIR = .obj -UI_DIR = .ui - -VER_MAJ = 1 -VER_MIN = 0 - -# make DLL -win32:{ - CONFIG += dll - DEFINES += QCA_MAKEDLL -} - -QCA_CPP = src -INCLUDEPATH += $$QCA_CPP -INCLUDEPATH += /usr/include/tqt - -HEADERS += \ - $$QCA_CPP/qca.h \ - $$QCA_CPP/qcaprovider.h - -SOURCES += \ - $$QCA_CPP/qca.cpp - -include(conf.pri) -include(extra.pri) - diff --git a/qca.qc b/qca.qc deleted file mode 100644 index cbe4cae..0000000 --- a/qca.qc +++ /dev/null @@ -1,5 +0,0 @@ - - Qt Cryptographic Architecture (QCA) - qca.pro - - diff --git a/qcextra b/qcextra deleted file mode 100755 index c02ba66..0000000 --- a/qcextra +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -cat >extra.pri <