From 452f57976a135c8b72fc8d8f580d5d50618c0cae Mon Sep 17 00:00:00 2001 From: Austin Henriksen Date: Wed, 30 Oct 2019 05:14:29 -0400 Subject: Remove checksum support (#607) * Removed checksum sources from swift mapping project file. * Removed checksum tests from Python. * Removed checksum from Python mapping. * Removed checksum tests from PHP mapping. * Removed checksum support from PHP mapping. * Removed checksum sources from MATLAB project file. * Removed checksum option from slice2x manpages. * Removed checksum sources from JavaScript mapping. * Removed checksum tests from Java mapping. * Removed outdated checksum metadata from Java mapping. * Removed checksum support from Java mapping. * Removed checksum tests from csharp. * Removed checksum support from csharp mapping. * Removed checksum tests from cpp * Removed checksum support from IceBox. * Removed checksum support from IceStorm. * Removed Slice checksum support from IceGrid. * Fixed broken filters file for Slice VS project. * Removed checksum support from cpp mapping. * Removed checksum support from Slice definitions. * Removed checksum support from cpp98 mapping. --- cpp/src/slice2java/Main.cpp | 32 -------------------------------- 1 file changed, 32 deletions(-) (limited to 'cpp/src/slice2java/Main.cpp') diff --git a/cpp/src/slice2java/Main.cpp b/cpp/src/slice2java/Main.cpp index a62eb17ed25..2474e0bded0 100644 --- a/cpp/src/slice2java/Main.cpp +++ b/cpp/src/slice2java/Main.cpp @@ -75,7 +75,6 @@ usage(const string& n) "--tie Generate tie classes. (Java Compat Only)\n" "--impl Generate sample implementations.\n" "--impl-tie Generate sample tie implementations. (Java Compat Only)\n" - "--checksum CLASS Generate checksums for Slice definitions into CLASS.\n" "--meta META Define file metadata directive META.\n" "--list-generated Emit list of generated files in XML format.\n" "--ice Allow reserved Ice prefix in Slice identifiers\n" @@ -107,7 +106,6 @@ compile(const vector& argv) opts.addOpt("d", "debug"); opts.addOpt("", "ice"); opts.addOpt("", "underscore"); - opts.addOpt("", "checksum", IceUtilInternal::Options::NeedArg); opts.addOpt("", "meta", IceUtilInternal::Options::NeedArg, "", IceUtilInternal::Options::Repeat); opts.addOpt("", "compat"); @@ -178,8 +176,6 @@ compile(const vector& argv) bool underscore = opts.isSet("underscore"); - string checksumClass = opts.optArg("checksum"); - bool listGenerated = opts.isSet("list-generated"); StringList globalMetadata; @@ -235,8 +231,6 @@ compile(const vector& argv) int status = EXIT_SUCCESS; - ChecksumMap checksums; - IceUtil::CtrlCHandler ctrlCHandler; ctrlCHandler.setCallback(interruptedCallback); @@ -366,15 +360,6 @@ compile(const vector& argv) gen.generateImpl(p); } } - - if(!checksumClass.empty()) - { - // - // Calculate checksums for the Slice definitions in the unit. - // - ChecksumMap m = createChecksums(p); - copy(m.begin(), m.end(), inserter(checksums, checksums.begin())); - } } catch(const Slice::FileException& ex) { @@ -417,23 +402,6 @@ compile(const vector& argv) writeDependencies(os.str(), dependFile); } - if(status == EXIT_SUCCESS && !checksumClass.empty() && !dependxml) - { - try - { - Gen::writeChecksumClass(checksumClass, output, checksums); - } - catch(const Slice::FileException& ex) - { - // - // If a file could not be created, then cleanup any created files. - // - FileTracker::instance()->cleanup(); - consoleErr << argv[0] << ": error: " << ex.reason() << endl; - return EXIT_FAILURE; - } - } - if(listGenerated) { FileTracker::instance()->dumpxml(); -- cgit v1.2.3