-#-*-coding:iso-8859-1-*-
+# -*- coding: utf-8 -*-
#
-# Copyright (C) 2010-2013 EDF R&D
+# Copyright (C) 2008-2019 EDF R&D
#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License.
+# This file is part of SALOME ADAO module
#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License.
#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
#
-# Author: André Ribes, andre.ribes@edf.fr, EDF R&D
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+# Author: André Ribes, andre.ribes@edf.fr, EDF R&D
import sys
import os
import traceback
import logging
-logging.basicConfig(level=logging.INFO, format='%(levelname)-8s %(message)s')
+logging.basicConfig(level=logging.WARNING, format='%(levelname)-8s %(message)s')
-print "-- Starting AdaoYacsSchemaCreator --"
+logging.debug("-- Starting AdaoYacsSchemaCreator --")
# Check some basics variables
if "ADAO_ROOT_DIR" not in os.environ:
- logging.fatal("You have to define ADAO_ROOT_DIR")
- sys.exit(1)
+ logging.fatal("You have to define ADAO_ROOT_DIR")
+ sys.exit(1)
try:
- from daYacsSchemaCreator.run import *
- from daYacsSchemaCreator.help_methods import *
-except:
- logging.fatal("Import of ADAO python modules failed !" +
- "\n add ADAO python installation directory in your PYTHONPATH")
- traceback.print_exc()
- sys.exit(1)
+ import adao
+ from daYacsSchemaCreator import run
+except ImportError as e:
+ logging.fatal("\n Import of YACS schema creator module failed, the error message is:\n" +
+ "\n %s\n"%(e,) +
+ "\n Add its installation directory in your PYTHONPATH.\n")
+ sys.exit(1)
# Parse arguments
-from optparse import OptionParser
-usage = "usage: %prog [options] config_file yacs_schema_filename"
-version="%prog 0.1"
-my_parser = OptionParser(usage=usage, version=version)
-(options, args) = my_parser.parse_args()
-check_args(args)
+from argparse import ArgumentParser
+usage = "usage: %(prog)s [options] config_file yacs_schema_filename"
+my_parser = ArgumentParser(usage=usage)
+my_parser.add_argument('config_file')
+my_parser.add_argument('yacs_schema_filename')
+args = my_parser.parse_args()
-config_file = args[0]
-yacs_schema_filename = args[1]
-create_schema(config_file, yacs_schema_filename)
+run.create_schema_from_file(args.config_file, args.yacs_schema_filename)