Project

Profile

Help

Revision d0e6f8be

Added by O'Neil Delpratt 10 months ago

Saxon/C update to test and gradle build update to include xerces in library

View differences:

build-c.gradle
508 508
  destinationDirectory = new File("${buildDir}/classes/eec")
509 509
}
510 510

  
511

  
512

  
511 513
task hec_jar(
512 514
  type: Jar,
513
  dependsOn: ["hecCompile", "hej_MetaInf"],
515
  dependsOn: ["hecCompile", "hej_MetaInf", "rejar_Xerces"],
514 516
  description: "Build the HE jar file for Saxon/C"
515 517
) {
516 518
  archiveBaseName = "saxon9he"
......
528 530
  from ("${buildDir}/src") {
529 531
    include "net/sf/saxon/data/**"
530 532
  }
533
  from ("${buildDir}/xerces") {
534
      include "**/*.class"
535
      include "**/*.properties"
536
      exclude "org.w3c.dom.html.HTMLDOMImplementation.class"
537
      exclude "META-INF/MANIFEST.MF"
538
    }
531 539
  doFirst {
532 540
    mkdir "build/c/jars/hec"
533 541
  }
......
535 543

  
536 544
task pec_jar(
537 545
  type: Jar,
538
  dependsOn: ["pecCompile", "pej_MetaInf"],
546
  dependsOn: ["pecCompile", "pej_MetaInf", "rejar_Xerces"],
539 547
  description: "Build the PE jar file for Saxon/C"
540 548
) {
541 549
  archiveBaseName = "saxon9pe"
......
567 575
    exclude "com/saxonica/config/EnterpriseXPathFactory.class"
568 576
    include "javax/xml/xquery/*.class"
569 577
  }
578
  from ("${buildDir}/xerces") {
579
      include "**/*.class"
580
      include "**/*.properties"
581
      exclude "org.w3c.dom.html.HTMLDOMImplementation.class"
582
      exclude "META-INF/MANIFEST.MF"
583
    }
570 584
  doFirst {
571 585
    mkdir "build/c/pec"
572 586
  }
......
574 588

  
575 589
task eec_jar(
576 590
  type: Jar,
577
  dependsOn: ["eecCompile", "eej_MetaInf"],
591
  dependsOn: ["eecCompile", "eej_MetaInf", "rejar_Xerces"],
578 592
  description: "Build the EE jar file for Saxon/C"
579 593
) {
580 594
  archiveBaseName = "saxon9ee"
......
593 607
    include "com/saxonica/**/*.class"
594 608
    include "javax/xml/xquery/*.class"
595 609
  }
610
  from ("${buildDir}/xerces") {
611
      include "**/*.class"
612
      include "**/*.properties"
613
      exclude "org.w3c.dom.html.HTMLDOMImplementation.class"
614
      exclude "META-INF/MANIFEST.MF"
615
    }
596 616
  doFirst {
597 617
    mkdir "build/c/eec"
598 618
  }
src/main/c/samples/cppTests/testXSLT30.cpp
473 473
                sresult->failure++;
474 474
                std::cerr << "trackingValueReference ====== FAIL ======" << std::endl;
475 475
                sresult->failureList.push_back("testTrackingOfValueReference");
476
                return;
476 477
            }
477 478
            name1.str("");
478 479
        }
......
1385 1386

  
1386 1387
void testCatalog(const char * cwd, SaxonProcessor * proc, sResultCount *sresult) {
1387 1388

  
1388

  
1389
    cout << endl << "Test: testCatalog" << endl;
1389 1390
    bool trace = false;
1390 1391
    proc->setcwd(cwd);
1391 1392
    proc->setCatalog("../php/catalog-test/catalog.xml", trace);
......
1400 1401
            const char *message = trans->getErrorMessage();
1401 1402
            cout << "exception=" << message << endl;
1402 1403
        }
1404
        return;
1403 1405
    }
1404 1406
    //trans->setSourceFromFile("/home/ond1/work/svn/latest9.9-saxonc/samples/php/catalog-test/example.xml");
1405 1407
    executable->setInitialMatchSelectionAsFile("../php/catalog-test/example.xml");

Also available in: Unified diff