modified argument order in calling qsys-generate script

core/generate_ip_libs

@@ -80,8 +80,8 @@ def run_qsys(buildset, outputdir, hdllib, vhdl_files, options):
         script += 'cd %s\n' % hdllib.location
         script += 'set -o pipefail\n'
         # echo line without 'Info:' to make sure grep it's exit code is 0
-        script += '(echo " " ; qsys-generate %s %s --output-directory=%s %s 2>&1) | grep -iv Info:\n' \
-                  % (options, extra_options, outputdir, vhdl_file)
+        script += '(echo " " ; qsys-generate %s %s %s --output-directory=%s 2>&1) | grep -iv Info:\n' \
+                  % (vhdl_file, options, extra_options, outputdir)
         script += 'exit_code=$?\n'
         script += 'exit $exit_code\n'
         # execute script
@@ -184,6 +184,7 @@ if __name__ == '__main__':
                         err_code = run_qmegawiz(args.buildset, outputdir, ip_lib_info, vhdl_files, tool_options)
                     elif ip_tool == 'qsys-generate':
                         err_code = run_qsys(args.buildset, outputdir, ip_lib_info, vhdl_files, tool_options)
+
                     elif ip_tool == 'quartus_sh':
                         err_code = run_quartus_sh(args.buildset, outputdir, ip_lib_info, vhdl_files, tool_options)
                     else:

core/hdl_libraries_wizard.py

@@ -533,6 +533,7 @@ class HdlLibrariesWizard:
                 for fpn_io in file_io:
                     sourcePathName  = cm.expand_file_path_name(fpn_io[0], lib_path)
                     destinationPath = cm.expand_file_path_name(fpn_io[1], build_dir_path)
+                    # print("Copy '{}'' to '{}'".format(sourcePathName, destinationPath))
                     if isfile(sourcePathName):
                         file_count += 1
                         shutil.copy(sourcePathName, destinationPath)     # copy file

set_config_path

-#!/bin/sh
+#!/bin/bash
 ###############################################################################
 #
 # Copyright (C) 2018

set_config_variable

-#!/bin/sh
+#!/bin/bash
 ###############################################################################
 #
 # Copyright (C) 2018

set_hdllib_variable

-#!/bin/sh
+#!/bin/bash
 ###############################################################################
 #
 # Copyright (C) 2018