Changeset 151

Show
Ignore:
Timestamp:
06/30/08 13:10:29 (6 months ago)
Author:
zork
Message:

vc fixes

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/dba

    • Property svn:ignore changed from
      configure
      Makefile.in
      autoconf_inc.m4
      config.guess
      config.sub
      autom4te.cache
      INSTALL
      aclocal.m4
      install-sh
      .bakefile_gen.state
      *.dsw
      *.dsp
      *.vc
      Doxyfile
      *.kdevelop.filelist
      *.kdevelop.pcs
      *.kdevses
      *.kdevelop
      build
      *.ncb
      *.sln
      *.suo
      *.vcproj
       to
      configure
      Makefile.in
      autoconf_inc.m4
      config.guess
      config.sub
      autom4te.cache
      INSTALL
      aclocal.m4
      install-sh
      .bakefile_gen.state
      *.dsw
      *.dsp
      *.vc
      Doxyfile
      *.kdevelop.filelist
      *.kdevelop.pcs
      *.kdevses
      *.kdevelop
      build
      *.ncb
      *.sln
      *.suo
      *.vcproj
      *.user

  • trunk/dba/bakefile/dba.bkl

    r150 r151  
    114114      <dll-link>dbacsv</dll-link> 
    115115    </template> 
    116     <template id="dba-xml-lib-static" template="dba-lib-static"> 
     116    <template id="dba-xml-lib-static" template="dba-lib-static,libxml2-lib"> 
    117117    </template> 
    118     <template id="dba-xml-exe-static" template="dba-exe-static"> 
     118    <template id="dba-xml-exe-static" template="dba-exe-static,libxml2-exe"> 
    119119      <static-link>dbaxml</static-link> 
    120120    </template> 
    121     <template id="dba-xml-lib-dynamic" template="dba-lib-dynamic"> 
     121    <template id="dba-xml-lib-dynamic" template="dba-lib-dynamic,libxml2-lib"> 
    122122    </template> 
    123     <template id="dba-xml-exe-dynamic" template="dba-exe-dynamic"> 
     123    <template id="dba-xml-exe-dynamic" template="dba-exe-dynamic,libxml2-exe"> 
    124124      <dll-link>dbaxml</dll-link> 
    125125    </template> 

  • trunk/dba/dba.bkl

    r150 r151  
    9999  </set> 
    100100 
    101   <template id="xml-lib"> 
    102     <if cond="FORMAT!='autoconf'"> 
    103       <if cond="TOOLSET=='win32'"> 
    104         <lib-path>"$(DOLLAR)($(ENV_VAR)LIBXML2)$(DIRSEP)lib"</lib-path> 
    105         <include>"$(DOLLAR)($(ENV_VAR)LIBXML2)$(DIRSEP)include"</include> 
    106       </if> 
    107     </if> 
    108     <if cond="FORMAT=='autoconf'"> 
    109       <cxxflags>$(xml2_CXXFLAGS)</cxxflags> 
    110     </if> 
    111   </template> 
    112    
    113   <template id="xml-exe" template="xml-lib"> 
    114     <if cond="FORMAT!='autoconf'"> 
    115       <if cond="TOOLSET=='win32'"> 
    116         <sys-lib>libxml2</sys-lib> 
    117       </if> 
    118     </if> 
    119     <if cond="FORMAT=='autoconf'"> 
    120       <ldlibs>$(xml2_LIBS)</ldlibs> 
    121     </if>     
    122   </template> 
    123    
    124   <template id="dbabase" template="xml-lib"> 
     101  <template id="dbabase"> 
    125102    <name>dba</name> 
    126103    <sources>$(LIBSOURCES)</sources>--> 
    …… 
    213190  <set var="MSVC6PRJ_MERGED_TARGETS" append="1">dbacsv=dbacsv_static+dbacsv_dynamic</set> 
    214191 
    215   <template id="dbaxml_base" template="xml-lib"> 
     192  <template id="dbaxml_base" template="libxml2-lib"> 
    216193    <name>dbaxml</name> 
    217194    <include>$(LIBSRC)</include> 
    …… 
    304281  </set> 
    305282 
    306   <lib id="dbatestlib" template="lib,xml-lib" template_append="cppunit" cond="TESTS=='1'"> 
     283  <lib id="dbatestlib" template="lib,libxml2-lib" template_append="cppunit" cond="TESTS=='1'"> 
    307284    <sources>$(TESTLIB_SOURCES)</sources> 
    308285    <msvc-headers>$(TESTLIB_HEADERS)</msvc-headers> 
    …… 
    318295  </lib> 
    319296 
    320   <template id="dbaexe_base" template_append="xml-exe"> 
     297  <template id="dbaexe_base" template_append="libxml2-exe"> 
    321298    <app-type>console</app-type> 
    322299    <include>$(SRCDIR)</include> 
    …… 
    417394  </set> 
    418395 
     396  <set var="XMLLIB"> 
     397    <if cond="XML=='1'">dbaxml</if> 
     398    <if cond="XML=='0'"></if> 
     399  </set> 
     400 
    419401  <win32-lib-install id="win32_install"> 
    420402    <include-subdir>dba</include-subdir> 
    421403    <include-files>$(LIBHEADERS)</include-files> 
    422     <libs>dba $(CSVLIB)</libs> 
     404    <libs>dba $(CSVLIB) $(XMLLIB)</libs> 
    423405    <dlls>dba</dlls> 
    424406    <modules>$(MODULES)</modules> 

  • trunk/dba/test/main.cpp

    r141 r151  
    144144  CppUnit::BriefTestProgressListener listener; 
    145145  runner.eventManager().addListener(&listener); 
    146   //runner.addTest( CppUnit::TestFactoryRegistry::getRegistry().makeTest() ); 
     146  runner.addTest( CppUnit::TestFactoryRegistry::getRegistry().makeTest() ); 
    147147  //runner.addTest(new CppUnit::TestCaller<SQLite3SQLArchiveTestCase>("debug_test",&SQLite3SQLArchiveTestCase::sqlError)); 
    148148  //runner.addTest(new CppUnit::TestCaller<PostgresSQLArchiveTestCase>("debug_test",&PostgresSQLArchiveTestCase::sqlError)); 
    …… 
    150150  //runner.addTest(new CppUnit::TestCaller<dba_tests::CSVTestCase>("debug_test",&dba_tests::CSVTestCase::manual)); 
    151151  //runner.addTest(new CppUnit::TestCaller<SQLite3SQLArchiveTestCase>("debug_test",&SQLite3SQLArchiveTestCase::transactions_rollback)); 
    152   runner.addTest(dba_tests::XMLTestCase::suite()); 
     152  //runner.addTest(dba_tests::XMLTestCase::suite()); 
    153153  //runner.addTest(new CppUnit::TestCaller<dba_tests::XMLTestCase>("debug_test",&dba_tests::XMLTestCase::sublist_tree_load)); 
    154154  //runner.addTest(new CppUnit::TestCaller<OdbcPluginTestCase>("debug_test",&OdbcPluginTestCase::dbConnection)); 

  • trunk/presets/syslibs.bkl

    r20 r151  
    1010    <sys-lib>iconv</sys-lib> 
    1111  </if> 
    12 <!--  <if cond="FORMAT=='autoconf'"> 
    13     <sys-lib>sqlite3</sys-lib> 
    14   </if>--> 
    1512</template> 
    1613 
    …… 
    4643  <if cond="FORMAT!='autoconf'"> 
    4744    <if cond="TOOLSET=='win32'"> 
    48       <lib-path>"$(DOLLAR)($(ENV_VAR)POSTGRESQL)$(DIRSEP)lib$(DIRSEP)ms"</lib-path> 
     45      <lib-path>"$(DOLLAR)($(ENV_VAR)POSTGRESQL)$(DIRSEP)lib"</lib-path> 
    4946      <include>"$(DOLLAR)($(ENV_VAR)POSTGRESQL)$(DIRSEP)include"</include> 
    5047    </if> 
    …… 
    117114    <sys-lib>wxbase28u$(LIBDEBUGSUFFIX)_net</sys-lib> 
    118115    <sys-lib>wxbase28u$(LIBDEBUGSUFFIX)_xml</sys-lib> 
    119     <sys-lib>wxbase28u$(LIBDEBUGSUFFIX)_odbc</sys-lib> 
    120116    <sys-lib>wxexpat$(LIBDEBUGSUFFIX)</sys-lib> 
    121117    <sys-lib>wxzlib$(LIBDEBUGSUFFIX)</sys-lib> 

  • trunk/wxdba/test/main.cpp

    r150 r151  
    6262      CppUnit::BriefTestProgressListener listener; 
    6363      runner.eventManager().addListener(&listener); 
    64       //runner.addTest( CppUnit::TestFactoryRegistry::getRegistry().makeTest() ); 
     64      runner.addTest( CppUnit::TestFactoryRegistry::getRegistry().makeTest() ); 
    6565      //runner.addTest(new CppUnit::TestCaller<wxdba_test::DateTimeGMTOffset>("debug_test",&wxdba_test::DateTimeGMTOffset::test6)); 
    6666      //runner.addTest(new CppUnit::TestCaller<wxdba_test::APITestCase>("debug_test",&wxdba_test::APITestCase::dbresult_conversion_win1250)); 
    6767      //runner.addTest(new CppUnit::TestCaller<SQLite3CollectionsTestCase>("debug_test",&SQLite3CollectionsTestCase::wxArray_store)); 
    68       runner.addTest(new CppUnit::TestCaller<wxdba_test::XMLTestCase>("debug_test",&wxdba_test::XMLTestCase::onerow)); 
     68      //runner.addTest(new CppUnit::TestCaller<wxdba_test::XMLTestCase>("debug_test",&wxdba_test::XMLTestCase::onerow)); 
    6969   
    7070      runner.run();