diff --git a/SConscript b/SConscript index d564a1ca7ef024f81614600ab1985298eb204a8a..984ccc6bd11c17ea42b860aafb61c93194125f2e 100644 --- a/SConscript +++ b/SConscript @@ -53,6 +53,7 @@ Export('env') # list of zipr plugins and irdb xforms to build transformDirs=''' builtin_xforms/add_lib + builtin_xforms/move_globals builtin_xforms/resolve_callbacks zipr_push64_reloc_plugin zipr diff --git a/builtin_xforms/move_globals/README.md b/builtin_xforms/move_globals/README.md deleted file mode 100644 index fd9e641f0fd181d86e38f7168184c2c7b3394ec0..0000000000000000000000000000000000000000 --- a/builtin_xforms/move_globals/README.md +++ /dev/null @@ -1 +0,0 @@ -tbd \ No newline at end of file diff --git a/builtin_xforms/move_globals/SConscript b/builtin_xforms/move_globals/SConscript index c9c8cff0609af04313b5b401affd1a9aa418fc6b..5b2ebc37cd6f35d1edbe9d93d19fcfc830e38552 100644 --- a/builtin_xforms/move_globals/SConscript +++ b/builtin_xforms/move_globals/SConscript @@ -23,7 +23,7 @@ LIBPATH="$PEASOUP_HOME/irdb-libs/lib" LIBS=Split("irdb-core irdb-cfg irdb-util irdb-transform irdb-deep StructDiv EXEIO ") myenv.Append(CPPPATH=Split(cpppath)) pgm=myenv.SharedLibrary(pgm, files, LIBPATH=LIBPATH, LIBS=LIBS) -install=myenv.Install("$MG_HOME/plugins_install/", pgm) +install=myenv.Install("$PEASOUP_HOME/irdb-libs/plugins_install/", pgm) Default(install) Return('install') diff --git a/builtin_xforms/move_globals/SConstruct b/builtin_xforms/move_globals/SConstruct deleted file mode 100644 index 863481ad3159fe83dcd0e9347efcc643f8a1d84c..0000000000000000000000000000000000000000 --- a/builtin_xforms/move_globals/SConstruct +++ /dev/null @@ -1,65 +0,0 @@ -# -# Copyright 2017-2019 University of Virginia -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - - -# -# Scons is python based. We import OS to get at the environment. -# -import os - - -# -# create a basic scons environment -# -env=Environment() - -# -# Include environment variables. These lines throw semi-readable errors if the environment is not defined properly. -# -env.Replace(IRDB_SDK= os.environ['IRDB_SDK'] ) # IRDB_SDK and IRDB_LIB by convention to find headers and libraries. -env.Replace(PEASOUP_HOME= os.environ['PEASOUP_HOME'] ) # IRDB_SDK and IRDB_LIB by convention to find headers and libraries. -env.Replace(IRDB_LIBS= os.environ['IRDB_LIBS'] ) -env.Replace(MG_HOME= os.environ['MG_HOME'] ) - - -# -# Check for "debug=1" on the scons command line -# -env.Replace(debug=ARGUMENTS.get("debug",0)) # build in debug mode? - -# -# Required: need these flag to appropriately include/link IRDB files. -# -env.Append(CXXFLAGS=" -std=c++11 ") # enable c++11 -env.Append(LINKFLAGS=" -Wl,-unresolved-symbols=ignore-in-shared-libs ") # irdb libs may have symbols that resolve OK at runtime, but not linktime. - - -# if we are building in debug mode, use -g, else use -O -if int(env['debug']) == 1: - env.Append(CFLAGS= " -g ") - env.Append(CXXFLAGS= " -g ") - env.Append(LINKFLAGS= " -g ") - env.Append(SHLINKFLAGS=" -g ") -else: - env.Append(CFLAGS= " -O ") - env.Append(CXXFLAGS= " -O ") - env.Append(LINKFLAGS= " -O ") - env.Append(SHLINKFLAGS=" -O ") - - -Export('env') -SConscript("SConscript", variant_dir='build') - diff --git a/builtin_xforms/move_globals/set_env_vars b/builtin_xforms/move_globals/set_env_vars deleted file mode 100644 index b579b5f02bd49186d5a55187cb5d62b87f567607..0000000000000000000000000000000000000000 --- a/builtin_xforms/move_globals/set_env_vars +++ /dev/null @@ -1,7 +0,0 @@ - - -# -# Tell pszr where to search for plugins -# -export MG_HOME=$PWD -export PSPATH=$PSPATH:$MG_HOME/plugins_install