From 7cfcb5e998f558e18a9efc7e0a6ab4d92ad04ff2 Mon Sep 17 00:00:00 2001 From: chris Date: Sun, 22 Sep 2002 10:53:48 +0000 Subject: [PATCH] for windows --- NewX509.cpp | 2 ++ mkxcapro.sh | 31 +++++++++++++++++++++++++----- xca.pro | 55 ++++++++++++++++++++++++++++++++++++++++++++++++----- 3 files changed, 78 insertions(+), 10 deletions(-) diff --git a/NewX509.cpp b/NewX509.cpp index 9af16a7e..8475994a 100644 --- a/NewX509.cpp +++ b/NewX509.cpp @@ -332,11 +332,13 @@ void NewX509::showPage(QWidget *page) void NewX509::templateChanged() { + //if (!appropriate(page1)) return; if (!tempList->isEnabled()) return; QString name = tempList->currentText(); if (name == "" || !temps) return; pki_temp *temp = (pki_temp *)temps->getSelectedPKI(name.latin1()); if (!temp) return; + CERR <<"CHANGING TEMPLATE" << endl; fromTemplate(temp); } diff --git a/mkxcapro.sh b/mkxcapro.sh index bdfbc971..bb89f453 100755 --- a/mkxcapro.sh +++ b/mkxcapro.sh @@ -1,13 +1,34 @@ #!/bin/sh P=xca.pro +W=win.bat if [ -e Makefile ]; then make distclean fi -echo "HEADERS = "`ls *.h` `ls lib/*.h` >$P -echo "SOURCES = "`ls *.cpp` `ls lib/*.cpp`>>$P -echo "FORMS = "`ls *.ui` >>$P -echo "TRANSLATIONS = "`ls xca_??.ts` >>$P -echo "TARGET = xca" >>$P +FORMS=`ls *.ui` +SOURCES="`ls *.cpp` `ls lib/*.cpp`" +HEADERS="`ls *.h` `ls lib/*.h` " + +echo "HEADERS=$HEADERS" >$P +echo "SOURCES=$SOURCES" >>$P +echo "FORMS=$FORMS" >>$P +echo "TRANSLATIONS="`ls xca_??.ts` >>$P +echo "TARGET=xca" >>$P + +rm -f $W + +for F in $FORMS; do + B=`echo $F |cut -d "." -f 1` + echo uic -o ${B}.h ${F} >> $W + echo uic -o ${B}.cpp -impl ${B}.h ${F} >> $W +done + +for F in $HEADERS; do + grep Q_OBJECT $F >/dev/null 2>&1 + if [ $? -eq 0 ]; then + B=`echo $F |cut -d "." -f 1` + echo moc -o moc_${B}.cpp ${F} >> $W + fi +done diff --git a/xca.pro b/xca.pro index cb66e5a4..98358b5f 100644 --- a/xca.pro +++ b/xca.pro @@ -1,5 +1,50 @@ -HEADERS = ExportKey.h MainWindow.h NewX509.h lib/db_base.h lib/db_key.h lib/db_temp.h lib/db_x509.h lib/db_x509req.h lib/pki_base.h lib/pki_key.h lib/pki_pkcs12.h lib/pki_temp.h lib/pki_x509.h lib/pki_x509req.h -SOURCES = ExportKey.cpp MainWindow.cpp MainWindowKeys.cpp MainWindowTemps.cpp MainWindowX509.cpp MainWindowX509Req.cpp NewX509.cpp main.cpp lib/db_base.cpp lib/db_key.cpp lib/db_temp.cpp lib/db_x509.cpp lib/db_x509req.cpp lib/pki_base.cpp lib/pki_key.cpp lib/pki_pkcs12.cpp lib/pki_temp.cpp lib/pki_x509.cpp lib/pki_x509req.cpp -FORMS = CertDetail.ui ExportKey_UI.ui KeyDetail.ui MainWindow_UI.ui NewKey.ui NewX509_UI.ui PassRead.ui PassWrite.ui ReqDetail.ui TrustState.ui -TRANSLATIONS = xca_de.ts xca_es.ts -TARGET = xca +HEADERS=CertDetail_UI.h +ExportKey.h +KeyDetail_UI.h +MainWindow.h +NewKey_UI.h +NewX509.h +PassRead_UI.h +PassWrite_UI.h +ReqDetail_UI.h +TrustState_UI.h lib/db_base.h +lib/db_key.h +lib/db_temp.h +lib/db_x509.h +lib/db_x509req.h +lib/pki_base.h +lib/pki_key.h +lib/pki_pkcs12.h +lib/pki_temp.h +lib/pki_x509.h +lib/pki_x509req.h +SOURCES=ExportKey.cpp +MainWindow.cpp +MainWindowKeys.cpp +MainWindowTemps.cpp +MainWindowX509.cpp +MainWindowX509Req.cpp +NewX509.cpp +main.cpp lib/db_base.cpp +lib/db_key.cpp +lib/db_temp.cpp +lib/db_x509.cpp +lib/db_x509req.cpp +lib/pki_base.cpp +lib/pki_key.cpp +lib/pki_pkcs12.cpp +lib/pki_temp.cpp +lib/pki_x509.cpp +lib/pki_x509req.cpp +FORMS=CertDetail.ui +ExportKey_UI.ui +KeyDetail.ui +MainWindow_UI.ui +NewKey.ui +NewX509_UI.ui +PassRead.ui +PassWrite.ui +ReqDetail.ui +TrustState.ui +TRANSLATIONS=xca_de.ts xca_es.ts +TARGET=xca