From d37189b7fca07574ec28fe086a6e005e7d287c4c Mon Sep 17 00:00:00 2001 From: jdh8d <jdh8d@git.zephyr-software.com> Date: Fri, 5 May 2017 15:56:46 +0000 Subject: [PATCH] pedi integration Former-commit-id: db6774286e104446e1290b4b768668217364a60d --- .gitattributes | 1 + SConscript | 5 +++++ SConstruct | 1 + libIRDB/src/core/fileir.cpp | 1 + manifest.txt | 4 ++++ 5 files changed, 12 insertions(+) create mode 100644 manifest.txt diff --git a/.gitattributes b/.gitattributes index 0b2ec112f..26df0c319 100644 --- a/.gitattributes +++ b/.gitattributes @@ -490,6 +490,7 @@ libtransform/tests/unsigned_add.64.c -text libtransform/tests/unsigned_add.c -text libtransform/tests/unsigned_mul.32.c -text libtransform/tests/unsigned_mul.64.c -text +/manifest.txt -text pebliss/trunk/Makefile -text pebliss/trunk/pe_bliss_tests_vc10.sln -text pebliss/trunk/pe_bliss_tests_vc9.sln -text diff --git a/SConscript b/SConscript index e236def15..512f856a7 100644 --- a/SConscript +++ b/SConscript @@ -90,3 +90,8 @@ if 'build_appfw' in env: SConscript("appfw/src/SConscript.64", variant_dir='scons_build/appfw.64') SConscript("appfw/src/SConscript.32", variant_dir='scons_build/appfw.32') +pedi = Command( target = "./testoutput", + source = "./SConscript", + action = os.environ['PEDI_HOME']+"/pedi -m manifest.txt " ) +Default( pedi ) + diff --git a/SConstruct b/SConstruct index 8c18d6cf2..ba6529c53 100644 --- a/SConstruct +++ b/SConstruct @@ -15,6 +15,7 @@ env.Replace(LINKFLAGS="-fPIC -w ") # parse arguments env.Replace(SECURITY_TRANSFORMS_HOME=os.environ['SECURITY_TRANSFORMS_HOME']) +env.Replace(PEDI_HOME=os.environ['PEDI_HOME']) env.Replace(SMPSA_HOME=os.environ['SMPSA_HOME']) env.Replace(do_64bit_build=ARGUMENTS.get("do_64bit_build",None)) env.Replace(debug=ARGUMENTS.get("debug",0)) diff --git a/libIRDB/src/core/fileir.cpp b/libIRDB/src/core/fileir.cpp index 81a505d0b..d19b493fd 100644 --- a/libIRDB/src/core/fileir.cpp +++ b/libIRDB/src/core/fileir.cpp @@ -1,3 +1,4 @@ + /* * Copyright (c) 2014 - Zephyr Software LLC * diff --git a/manifest.txt b/manifest.txt new file mode 100644 index 000000000..b5b5bb6ef --- /dev/null +++ b/manifest.txt @@ -0,0 +1,4 @@ + + +directory plugins_install ps +directory bin ps -- GitLab