From da8805bb69afd232991a8031d3164f02e78da644 Mon Sep 17 00:00:00 2001 From: "Fred T. Hamster" Date: Sun, 22 May 2022 07:05:11 -0400 Subject: [PATCH] clam changes tossing out old visual studio schlubs --- documentation/clam_manual/clam_docs.html | 8 +- .../bundler/makefile.bundle_creator | 9 +- .../bundler/makefile.unpacker_stub | 12 +- nucleus/tools/simple_utilities/makefile | 11 - scripts/archival/snarf_feisty_meow.pl | 3 +- scripts/clam/cpp/get_version.sh | 9 - scripts/clam/cpp/ms_manifest.sh | 33 -- .../cpp/ms_manifests/security_manifest.txt | 18 - .../security_manifest_administrator.txt | 11 - ...ecurity_manifest_administrator_with_ui.txt | 11 - .../security_manifest_highest.txt | 11 - .../ms_manifests/security_manifest_normal.txt | 11 - scripts/clam/cpp/rc_name.sh | 4 - scripts/clam/cpp/rebuild_oldies.sh | 12 - scripts/clam/cpp/rules.def | 216 +------- scripts/clam/cpp/variables.def | 322 +---------- scripts/clam/cpp/vis_stu/trap_new.addin | 7 - scripts/clam/cpp/vis_stu/untrap_new.addin | 15 - scripts/clam/dotnet-retired/csharper.sh | 8 - scripts/clam/dotnet-retired/postconditions.sh | 107 ---- scripts/clam/dotnet-retired/preconditions.sh | 41 -- scripts/clam/dotnet-retired/readme.txt | 9 - scripts/clam/dotnet-retired/rules.def | 262 --------- scripts/clam/dotnet-retired/variables.def | 514 ------------------ scripts/customize/fred/fred_variables.sh | 2 +- scripts/z_outgoing/dotnet-retired/csharper.sh | 8 - .../dotnet-retired/postconditions.sh | 107 ---- .../dotnet-retired/preconditions.sh | 41 -- scripts/z_outgoing/dotnet-retired/readme.txt | 9 - scripts/z_outgoing/dotnet-retired/rules.def | 262 --------- .../z_outgoing/dotnet-retired/variables.def | 514 ------------------ scripts/z_outgoing/ms_root_dir.sh | 19 - scripts/z_outgoing/vis_stu_vars.sh | 110 ---- 33 files changed, 19 insertions(+), 2717 deletions(-) delete mode 100644 scripts/clam/cpp/ms_manifest.sh delete mode 100644 scripts/clam/cpp/ms_manifests/security_manifest.txt delete mode 100644 scripts/clam/cpp/ms_manifests/security_manifest_administrator.txt delete mode 100644 scripts/clam/cpp/ms_manifests/security_manifest_administrator_with_ui.txt delete mode 100644 scripts/clam/cpp/ms_manifests/security_manifest_highest.txt delete mode 100644 scripts/clam/cpp/ms_manifests/security_manifest_normal.txt delete mode 100644 scripts/clam/cpp/rc_name.sh delete mode 100644 scripts/clam/cpp/rebuild_oldies.sh delete mode 100644 scripts/clam/cpp/vis_stu/trap_new.addin delete mode 100644 scripts/clam/cpp/vis_stu/untrap_new.addin delete mode 100644 scripts/clam/dotnet-retired/csharper.sh delete mode 100644 scripts/clam/dotnet-retired/postconditions.sh delete mode 100644 scripts/clam/dotnet-retired/preconditions.sh delete mode 100644 scripts/clam/dotnet-retired/readme.txt delete mode 100644 scripts/clam/dotnet-retired/rules.def delete mode 100644 scripts/clam/dotnet-retired/variables.def delete mode 100644 scripts/z_outgoing/dotnet-retired/csharper.sh delete mode 100644 scripts/z_outgoing/dotnet-retired/postconditions.sh delete mode 100644 scripts/z_outgoing/dotnet-retired/preconditions.sh delete mode 100644 scripts/z_outgoing/dotnet-retired/readme.txt delete mode 100644 scripts/z_outgoing/dotnet-retired/rules.def delete mode 100644 scripts/z_outgoing/dotnet-retired/variables.def delete mode 100644 scripts/z_outgoing/ms_root_dir.sh delete mode 100644 scripts/z_outgoing/vis_stu_vars.sh diff --git a/documentation/clam_manual/clam_docs.html b/documentation/clam_manual/clam_docs.html index b5380512..9cca8bbd 100644 --- a/documentation/clam_manual/clam_docs.html +++ b/documentation/clam_manual/clam_docs.html @@ -1463,12 +1463,8 @@ needed for the compiler.  Not all operating system choices above are suitable - with the COMPILER choices, but generally it is fairly obvious which are - supported.  The current possibilities include BORLAND_DOS, - BORLAND_OS2, - UNIX (default cc), GNU_OS2, GNU_LINUX, OBJECT_CENTER (Saber compiler), - SUN_UNIX, - VISUAL_CPP, and DIAB3. + with the COMPILER choice.  The current possibilities include + GNU_LINUX, GNU_WINDOWS, and GNU_DARWIN.

COMPILER_FLAGS

     This is the list of flags passed to diff --git a/nucleus/applications/bundler/makefile.bundle_creator b/nucleus/applications/bundler/makefile.bundle_creator index 57ac4333..78cff28e 100644 --- a/nucleus/applications/bundler/makefile.bundle_creator +++ b/nucleus/applications/bundler/makefile.bundle_creator @@ -11,14 +11,7 @@ endif DEFINITIONS += __BUILD_STATIC_APPLICATION__=t TARGETS = bundle_creator.exe -#hmmm: these should be done with a USE_ZLIB macro. -ifeq "$(COMPILER)" "VISUAL_CPP" - LOCAL_HEADERS += $(THIRD_PARTY_DIR)/zlib/include - LOCAL_LIBRARIES += $(THIRD_PARTY_DIR)/zlib/lib - LIBS_USED += zlib.lib -else - LIBS_USED += z -endif +LIBS_USED += z include cpp/rules.def diff --git a/nucleus/applications/bundler/makefile.unpacker_stub b/nucleus/applications/bundler/makefile.unpacker_stub index ad646b9a..804177e4 100644 --- a/nucleus/applications/bundler/makefile.unpacker_stub +++ b/nucleus/applications/bundler/makefile.unpacker_stub @@ -14,17 +14,7 @@ TARGETS = unpacker_stub.exe LAST_TARGETS = show_makefilename OTHER_CLEANS = mocko -#hmmm: why on earth is this gunk not already available -# in some specialized vcpp variable? yuck! -ifeq "$(COMPILER)" "VISUAL_CPP" - LIBS_USED += libcmt.lib shlwapi.lib zlib.lib - LOAD_FLAG_PREFIX += -nodefaultlib:msvcrt.lib - COMPILER_FLAGS += -MT - LOCAL_HEADERS += $(THIRD_PARTY_DIR)/zlib/include - LOCAL_LIBRARIES += $(THIRD_PARTY_DIR)/zlib/lib -else - LIBS_USED += z -endif +LIBS_USED += z include cpp/rules.def diff --git a/nucleus/tools/simple_utilities/makefile b/nucleus/tools/simple_utilities/makefile index 5983fae5..83cd0e2a 100644 --- a/nucleus/tools/simple_utilities/makefile +++ b/nucleus/tools/simple_utilities/makefile @@ -12,17 +12,6 @@ ifeq "$(OMIT_VERSIONS)" "" endif DEFINITIONS += __BUILD_STATIC_APPLICATION__ UNDEFINITIONS += ENABLE_MEMORY_HOOK ENABLE_CALLSTACK_TRACKING -ifeq "$(COMPILER)" "VISUAL_CPP" - # static C runtime support... -#hmmm: resurrect this as a particular build type, so makefiles don't need to know this... - COMPILER_FLAGS += -MT - LIBS_USED += netapi32.lib - ifeq "$(DEBUG)" "" - LIBS_USED += libcmt.lib - else - LIBS_USED += libcmtd.lib - endif -endif include cpp/rules.def diff --git a/scripts/archival/snarf_feisty_meow.pl b/scripts/archival/snarf_feisty_meow.pl index 20e15a77..764196fd 100644 --- a/scripts/archival/snarf_feisty_meow.pl +++ b/scripts/archival/snarf_feisty_meow.pl @@ -35,7 +35,7 @@ local($snarf_file) = &snarf_name($snarf_file_base, $number); local($root) = &canonicalize("$FEISTY_MEOW_APEX"); # grab the top level stuff. -&backup_files($snarf_file_base, $number, $root, ".", ("*.txt", "make*", ".gitignore", "*.yml")); +&backup_files($snarf_file_base, $number, $root, ".", ("*.txt", "make*", ".gitignore", ".mailmap", "*.yml")); # snarf up all the important directories. # CAK: current as of 2012-05-05. @@ -49,6 +49,7 @@ local($root) = &canonicalize("$FEISTY_MEOW_APEX"); &backup_hierarchy($snarf_file_base, $number, $root, "octopi"); &backup_hierarchy($snarf_file_base, $number, $root, "scripts"); &backup_hierarchy($snarf_file_base, $number, $root, "hypermedia"); +&backup_hierarchy($snarf_file_base, $number, $root, "testkit"); &backup_hierarchy($snarf_file_base, $number, $root, "walrus"); # grab the production assets. diff --git a/scripts/clam/cpp/get_version.sh b/scripts/clam/cpp/get_version.sh index 4ca187fb..4d4941e3 100644 --- a/scripts/clam/cpp/get_version.sh +++ b/scripts/clam/cpp/get_version.sh @@ -23,15 +23,6 @@ if [ "$COMPILER" = "GNU_LINUX" \ elif [ "$COMPILER" = "GNU_ARM_LINUX" ]; then # compiler version report for the gnu compiler on the arm processor. gcc -### 2>&1 | grep "gcc version" | sed -e 's/^gcc version \([0-9.][0-9.]*\) .*$/\1/' -#elif [ "$COMPILER" = "VISUAL_CPP" ]; then -# # compiler version report for ms visual studio. -# ver_raw=`$COMPILER_ROOT_DIR/bin/cl 2>&1 | head -1 | sed -e 's/.*Version \([0-9][0-9]*\)\..*$/\1/'` -# if [ "$ver_raw" = "12" ]; then echo 6; -# elif [ "$ver_raw" = "13" ]; then echo 7; -# elif [ "$ver_raw" = "14" ]; then echo 8; -# elif [ "$ver_raw" = "15" ]; then echo 9; -# elif [ "$ver_raw" = "16" ]; then echo 10; -# fi else echo "0" fi diff --git a/scripts/clam/cpp/ms_manifest.sh b/scripts/clam/cpp/ms_manifest.sh deleted file mode 100644 index 94f0f669..00000000 --- a/scripts/clam/cpp/ms_manifest.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -# the target is the file that needs its manifest stuffed into the file -# itself. the where parameter tells us what index to use when stuffing it. -target=$1; shift -where=$1; shift -if [ -z "$WIN32_MANIFEST_FILE" ]; then - WIN32_MANIFEST_FILE=$CLAM_SCRIPTS/cpp/ms_manifests/security_manifest.txt -fi -for ((count=1 ; count <= 10; count++)); do - error_val=0 - if [ -f "$target.manifest" -a -f "$target" ]; then - bash $BUILD_SCRIPTS_PATH/wrapdoze.sh mt -manifest $target.manifest $WIN32_MANIFEST_FILE -outputresource:$target\;$where >/dev/null - error_val=$? - elif [ -f "$target" ]; then - bash $BUILD_SCRIPTS_PATH/wrapdoze.sh mt -manifest $WIN32_MANIFEST_FILE -outputresource:$target\;$where >/dev/null - error_val=$? - else - echo skipping manifest generation for $target. - if [ ! -f "$target.manifest" ]; then echo manifest file was missing.; fi - if [ ! -f "$target" ]; then echo main file was missing.; fi - break - fi - if [ $error_val -ne 0 ]; then - echo "Error attaching manifest to $target at try #$count." - else - break - fi -done -if [ $error_val -ne 0 ]; then - echo There was an error attaching manifest to $target. - exit 12 -fi - diff --git a/scripts/clam/cpp/ms_manifests/security_manifest.txt b/scripts/clam/cpp/ms_manifests/security_manifest.txt deleted file mode 100644 index 90dfd47c..00000000 --- a/scripts/clam/cpp/ms_manifests/security_manifest.txt +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/scripts/clam/cpp/ms_manifests/security_manifest_administrator.txt b/scripts/clam/cpp/ms_manifests/security_manifest_administrator.txt deleted file mode 100644 index b9ed75b9..00000000 --- a/scripts/clam/cpp/ms_manifests/security_manifest_administrator.txt +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/scripts/clam/cpp/ms_manifests/security_manifest_administrator_with_ui.txt b/scripts/clam/cpp/ms_manifests/security_manifest_administrator_with_ui.txt deleted file mode 100644 index e54f4bf5..00000000 --- a/scripts/clam/cpp/ms_manifests/security_manifest_administrator_with_ui.txt +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/scripts/clam/cpp/ms_manifests/security_manifest_highest.txt b/scripts/clam/cpp/ms_manifests/security_manifest_highest.txt deleted file mode 100644 index 57b1deb1..00000000 --- a/scripts/clam/cpp/ms_manifests/security_manifest_highest.txt +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/scripts/clam/cpp/ms_manifests/security_manifest_normal.txt b/scripts/clam/cpp/ms_manifests/security_manifest_normal.txt deleted file mode 100644 index 22857fcc..00000000 --- a/scripts/clam/cpp/ms_manifests/security_manifest_normal.txt +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/scripts/clam/cpp/rc_name.sh b/scripts/clam/cpp/rc_name.sh deleted file mode 100644 index d069d35b..00000000 --- a/scripts/clam/cpp/rc_name.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -if [ -f version.ini ]; then - grep "root *=" version.ini | sed -e "s/root *= *//" -e "s/ *$//" -fi diff --git a/scripts/clam/cpp/rebuild_oldies.sh b/scripts/clam/cpp/rebuild_oldies.sh deleted file mode 100644 index 0edc0072..00000000 --- a/scripts/clam/cpp/rebuild_oldies.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -if [ -f "$BUILD_LIST_FILE" ]; then - echo Compiling Objects [$(cat $BUILD_LIST_FILE | while read input_text; do echo $(basename $input_text); done )] - rm -f $(cat $BUILD_WHACK_FILE) -#echo got line to run: $* - eval "${@}" - rm -f $BUILD_LIST_FILE $BUILD_WHACK_FILE - if [ $? -ne 0 ]; then - . "$CLAM_SCRIPTS/exit_make.sh" - fi -fi - diff --git a/scripts/clam/cpp/rules.def b/scripts/clam/cpp/rules.def index b1792bfd..292e769f 100644 --- a/scripts/clam/cpp/rules.def +++ b/scripts/clam/cpp/rules.def @@ -151,119 +151,6 @@ endif ############################################################################### - -# additions for gnu x86 and arm compilers. -ifneq "$(OP_SYSTEM)" "WIN32" - # is the freetds library support available on this host. - ifneq "$(ENABLE_FREETDS)" "" - # establish the headers if freetds is enabled. that just means things - # can be compiled against it. to link in the db-lib, the makefile should - # have a "USE_FREETDS = true" statement. - - # is this particular library or app using freetds? - ifneq "$(USE_FREETDS)" "" - DEFINITIONS += ENABLE_FREETDS _FREETDS_LIBRARY_SOURCE - LIBS_USED += rt sybdb - endif - endif -endif - -## win32 compiler additions. -##ifeq "$(OP_SYSTEM)" "WIN32" -#ifeq "$(COMPILER)" "VISUAL_CPP" -# # processes the def file for linkage, if one has been specified. -# ifneq "$(DEF_FILE)" "" -# LOAD_FLAG_PREFIX += -def:$(DEF_FILE) -# endif -# -# ifneq "$(TYPE)" "library" -# ifneq "$(USE_MFC)" "" -# ifneq "$(findstring UNICODE, $(DEFINITIONS))" "" -# # specify the winmain type for unicode explicitly. -# LOAD_FLAG_PREFIX += -entry:wWinMainCRTStartup -# endif -# endif -# endif -# -# # these are loaded after any special debugging libs. -# ifneq "$(VCPP_USE_BASE)" "" -# # the first set will be included in almost any old program. we include -# # winmm for multimedia in the base support since we make heavy use of the -# # more accurate uptime function. -# LOAD_FLAG_PREFIX += kernel32.lib user32.lib advapi32.lib shell32.lib \ -# version.lib winmm.lib shlwapi.lib -# endif -# -# ifneq "$(USE_WXWIDGETS)" "" -# DEFINITIONS += __WXWIDGETS__ __WXMSW__ -# LOCAL_HEADERS += $(THIRD_PARTY_DIR)/wxwidgets/include -# LIBRARY_SEARCH_PATH += $(THIRD_PARTY_DIR)/wxwidgets/lib -## ifeq "$(findstring UNICODE, $(DEFINITIONS))" "" -# LIBS_USED += wxmsw28_core.lib -# LOCAL_HEADERS += $(THIRD_PARTY_DIR)/wxwidgets/lib/msw -## else -## DEFINITIONS += wxUSE_UNICODE -## LIBS_USED += wxmsw28u_core.lib -## LOCAL_HEADERS += $(THIRD_PARTY_DIR)/wxwidgets/lib/mswu -## endif -# -### LOAD_FLAG_PREFIX += comctl32.lib shell32.lib -# VCPP_USE_GUI = t -# VCPP_USE_OLE = t -# endif -# -# ifneq "$(USE_CURL)" "" -## # curl wants this win32 flag? -# DEFINITIONS += WIN32 -# LOCAL_HEADERS += $(THIRD_PARTY_DIR)/curl/include -# LIBRARY_SEARCH_PATH += $(THIRD_PARTY_DIR)/curl/lib -## LIBS_USED += libcurl.dll.a -# LIBS_USED += libcurl.lib -# endif -# -# ifneq "$(VCPP_USE_GUI)" "" -# LOAD_FLAG_PREFIX += comctl32.lib comdlg32.lib gdi32.lib winspool.lib -# endif -# -# ifneq "$(VCPP_USE_OLE)" "" -# LOAD_FLAG_PREFIX += ole32.lib oleaut32.lib uuid.lib -# VCPP_USE_RPC = t -# endif -# ifneq "$(VCPP_USE_RPC)" "" -# ifeq "$(COMPILER_VERSION)" "8" -# LOAD_FLAG_PREFIX += rpcndr.lib rpcns4.lib rpcrt4.lib -# endi#f -# ifeq "$(COMPILER_VERSION)" "10" -# LOAD_FLAG_PREFIX += rpcrt4.lib -# endif -# VCPP_USE_SOCK = t -# endif -# ifneq "$(VCPP_USE_SOCK)" "" -# LOAD_FLAG_PREFIX += netapi32.lib ws2_32.lib -# endif -# ifneq "$(VCPP_USE_CLR)" "" -# LOAD_FLAG_PREFIX += -noentry -include:"__DllMainCRTStartup@12" -# COMPILER_FLAGS += -EHa -clr -AI "$(FRAMEWORK_DIR)" -AI "$(DYNAMIC_LIBRARY_DIR)" -FU "mscorlib.dll" -FU "System.dll" -FU "System.Data.dll" -FU "System.Windows.Forms.dll" -FU "System.Drawing.dll" -# endif -# -# ifneq "$(USE_SSL)" "" -# LOCAL_HEADERS += $(THIRD_PARTY_DIR)/openssl/include -# LIBRARY_SEARCH_PATH += $(THIRD_PARTY_DIR)/openssl/lib -# LIBS_USED += libcrypto.lib libssl.lib -##no, yuck. $(shell cp $(THIRD_PARTY_DIR)/openssl/lib/*dll $(EXECUTABLE_DIR) ) -# endif -# -#endif - -#ifeq "$(COMPILER)" "VISUAL_CPP" -# # prep the actual source variable so that certain file names are translated. -# ACTUAL_RESX = $(RESX:%.resx=$(OBJECT_DIR)/%.resources) -# ACTUAL_RESX_FLAGS = $(ACTUAL_RESX:%=-ASSEMBLYLINKRESOURCE:%) -#else - ACTUAL_RESX = - ACTUAL_RESX_FLAGS = -#endif - # Create the real list of local libraries needed. TEMP_LOC1 = $(LOCAL_LIBS_USED:%=%$(TRIPART_VERSION)) ACTUAL_LOCAL_LIBS = $(TEMP_LOC1) @@ -271,25 +158,10 @@ ACTUAL_LOCAL_LIBS = $(TEMP_LOC1) # Create the list of objects from the list of source files. TEMP_OBJ1 = $(SOURCE:%.cpp=%.obj) TEMP_OBJ2 = $(TEMP_OBJ1:%.c=%.obj) -#ifeq "$(COMPILER)" "VISUAL_CPP" -# ifneq "$(OMIT_VERSIONS)" "" -# # remove version rc files if we are not dealing with versions. -# TEMP_OBJ3a = $(TEMP_OBJ2:%_version.rc=) -# else -# TEMP_OBJ3a = $(TEMP_OBJ2) -# endif -# ifeq "$(COMPILER)" "VISUAL_CPP" -# TEMP_OBJ3 = $(TEMP_OBJ3a:%.rc=%.res) -# else -# TEMP_OBJ3 = $(TEMP_OBJ3a) -# endif -#else # replace this when supporting resource files on unix. TEMP_OBJ3 = $(TEMP_OBJ2:%.rc=) -#endif - TEMP_OBJ4 = $(TEMP_OBJ3:%.h=%.bad) OBJECTS = $(TEMP_OBJ4) @@ -336,19 +208,6 @@ EXE_CPPS = $(EXE_TEMP_3:%.exe=%.cpp) # used for compiling multiple source files at the same time with visual cpp. MULTI_BUILD_CMD = $(CC) $(COMPILER_FLAGS) -c `cat $(BUILD_LIST_FILE)` $(OBJECT_NAME_FLAG)$(OBJECT_DIR)/ -# prepare for mfc style DLLs. currently we plan on all dlls we create being -# based on MFC. this is an unfortunate requirement for using the mfc debug -# support for allocations. if regular new and DEBUG_NEW get mixed together, -# crashes used to result. supposedly these are gone now at least. -ifneq "$(USE_MFC)" "" -# ifeq "$(COMPILER)" "VISUAL_CPP" -# # set the flag that says we are doing mfc extension dlls. -# DEFINITIONS += _AFXDLL -# DEPENDENCY_DEFINITIONS += _MT _DLL -# DEPENDENCY_DEFINITIONS += __AFXWIN_H__ # add this flag to shut stdafx up. -# endif -endif - ifeq "$(OMIT_VERSIONS)" "" ifneq "$(VERSION_RC_ROOT)" "" VERSION_TARGET = $(VERSION_RC_ROOT)_version.rc @@ -478,15 +337,9 @@ cpp_add_to_cleanups_variable: $(OBJECT_DIR)/%.obj: $(CURRENT_DIR)/%.cpp ifeq "$(NO_COMPILE)" "" -# ifneq "$(COMPILER)" "VISUAL_CPP" @echo Compiling Object [$(notdir $@)] $(HIDESH)-c 'if [ ! -d $(@D) ]; then mkdir $(@D); fi' $(CATCHER)$(CC) $(COMPILER_FLAGS) -c $< $(OBJECT_NAME_FLAG)$@ -# else -# @echo $< >>$(BUILD_LIST_FILE) -# @echo $@ >>$(BUILD_WHACK_FILE) -# @echo >$@ -# endif endif ############################################################################ @@ -495,43 +348,21 @@ endif $(OBJECT_DIR)/%.obj: $(CURRENT_DIR)/%.c ifeq "$(NO_COMPILE)" "" -# ifneq "$(COMPILER)" "VISUAL_CPP" @echo Compiling Object [$(notdir $@)] $(HIDESH)-c 'if [ ! -d $(@D) ]; then mkdir $(@D); fi' $(CATCHER)$(CC) $(COMPILER_FLAGS) -c $< $(OBJECT_NAME_FLAG)$@ -# else -# @echo $< >>$(BUILD_LIST_FILE) -# @echo $@ >>$(BUILD_WHACK_FILE) -# @echo >$@ -# endif endif ############################################################################ # resource compiler for win32. -#ifeq "$(COMPILER)" "VISUAL_CPP" -#$(OBJECT_DIR)/%.res: %.rc $(PARAMETER_FILE) -# ifeq "$(NO_COMPILE)" "" -# @echo Resource [$@] -# $(HIDESH)-c 'if [ ! -d $(@D) ]; then mkdir $(@D); fi' -# $(CATCHER)$(RC) -r $(DEFINITIONS:%=-D%) $(HEADER_SEARCH_PATH:%=-i%) -fo $@ $< -# endif -# -#$(OBJECT_DIR)/%.resources: %.resx $(PARAMETER_FILE) -# ifeq "$(NO_COMPILE)" "" -# @echo Resource [$@] -# $(HIDESH)-c 'if [ ! -d $(@D) ]; then mkdir $(@D); fi' -# $(VCS_ROOT)/../SDK/v1.1/bin/resgen $< $@ -# endif -#else #non-visual studio - # this platform probably does not use rc files. +# we currently do not use rc files. $(OBJECT_DIR)/%.res: %.rc ifeq "$(NO_COMPILE)" "" @echo Bogus resource [$@] @echo >$@ endif -#endif #win32 ############################################################################ @@ -544,9 +375,6 @@ ifeq "$(NO_COMPILE)" "" $(STATIC_LIBRARY_DIR)/%.library: $(ACTUAL_OBJECTS:%=$(OBJECT_DIR)/%) $(ACTUAL_LOCAL_LIBS:%=$(STATIC_LIBRARY_DIR)/$(LIB_PREFIX)%$(LIB_ENDING)) $(PARAMETER_FILE) $(HIDER)echo Building Static Library [$(notdir $@)] @echo $@ >$(DIRTY_FILE) -# ifeq "$(COMPILER)" "VISUAL_CPP" -# $(HIDESH)-c 'if [ -f $(BUILD_LIST_FILE) ]; then $(SHELL) $(CLAM_SCRIPTS)/cpp/rebuild_oldies.sh $(MULTI_BUILD_CMD); fi' -# endif $(CATCHER)$(LIBRARY_TOOL) $(LIBRARIAN_FLAGS) $(CREATE_LIBRARY_FLAG)$@ $(ACTUAL_OBJECTS:%=$(OBJECT_DIR)/%) ifneq "$(OP_SYSTEM)" "UNIX" $(HIDER)mv $@ $(STATIC_LIBRARY_DIR)/$(LIB_PREFIX)$*$(LIB_ENDING) @@ -573,14 +401,8 @@ endif ifeq "$(NO_COMPILE)" "" $(DYNAMIC_LIBRARY_DIR)/%.dll: $(ACTUAL_OBJECTS:%=$(OBJECT_DIR)/%) $(ACTUAL_LOCAL_LIBS:%=$(STATIC_LIBRARY_DIR)/$(LIB_PREFIX)%$(LIB_ENDING)) $(ACTUAL_RESX) $(PARAMETER_FILE) -#hmmm: use the res objects variable to rebuild res files as needed. -###$(RES_OBJECTS) $(HIDER)echo Building Dynamic Library [$(notdir $@)] @echo $@ >$(DIRTY_FILE) -# ifeq "$(COMPILER)" "VISUAL_CPP" -# $(HIDESH)-c 'if [ -f $(BUILD_LIST_FILE) ]; then $(SHELL) $(CLAM_SCRIPTS)/cpp/rebuild_oldies.sh $(MULTI_BUILD_CMD); fi' -# endif -#hmmm: this is way way out of date. not right now. $(HIDER)rm -f $(@:%.dll=%.lib) echo about to run link tool. $(CATCHER)$(LINK_TOOL) $(LINKER_OUTPUT_FLAG)$@ -dll $(LOAD_FLAG_PREFIX) $(ACTUAL_OBJECTS:%=$(OBJECT_DIR)/%) $(ACTUAL_RESX_FLAGS) $(ACTUAL_LOCAL_LIBS:%=$(LIBRARY_NAME_FLAG)$(LIB_PREFIX)%$(LIB_ENDING)) $(LOAD_FLAG_SUFFIX) @@ -615,46 +437,18 @@ endif #no_compile # creates "exe" executables using all of the appropriate objects. -#ifeq "$(COMPILER)" "VISUAL_CPP" -# ifneq "$(NO_COMPILE)" "" -#$(EXECUTABLE_DIR)/%.exe: -# endif -# -# ifeq "$(NO_COMPILE)" "" -#$(EXECUTABLE_DIR)/%.exe: $(OBJECT_DIR)/%.obj $(ACTUAL_OBJECTS:%=$(OBJECT_DIR)/%) $(ACTUAL_LOCAL_LIBS:%=$(STATIC_LIBRARY_DIR)/$(LIB_PREFIX)%$(LIB_ENDING)) $(ACTUAL_RESX) $(PARAMETER_FILE) -# $(HIDER)echo Building Application [$(notdir $@)] -# @echo $@ >$(DIRTY_FILE) -# ifeq "$(COMPILER)" "VISUAL_CPP" -# $(HIDESH)-c 'if [ -f $(BUILD_LIST_FILE) ]; then $(SHELL) $(CLAM_SCRIPTS)/cpp/rebuild_oldies.sh $(MULTI_BUILD_CMD); fi' -# endif -# $(CATCHER)$(LINK_TOOL) $(EXE_FLAGS) $(LOAD_FLAG_PREFIX) $< $(ACTUAL_OBJECTS:%=$(OBJECT_DIR)/%) $(ACTUAL_RESX_FLAGS) $(ACTUAL_LOCAL_LIBS:%=$(LIBRARY_NAME_FLAG)$(LIB_PREFIX)%$(LIB_ENDING)) $(LOAD_FLAG_SUFFIX) $(LINKER_OUTPUT_FLAG)$@ -##$(^:force_rebuild=) -# ifeq "$(COMPILER_VERSION)" "8" -# $(HIDESH)$(CLAM_SCRIPTS)/cpp/ms_manifest.sh "$@" "1" -# endif -# ifeq "$(COMPILER_VERSION)" "10" -# $(HIDESH)$(CLAM_SCRIPTS)/cpp/ms_manifest.sh "$@" "1" -# endif -# ifneq "$(VCPP_VISTA_ICON)" "" -# $(HIDER)ReplaceVistaIcon "$@" "$(VCPP_VISTA_ICON)" -# endif -# endif #no_compile -#endif #visual studio - -#ifneq "$(COMPILER)" "VISUAL_CPP" - ifneq "$(NO_COMPILE)" "" +ifneq "$(NO_COMPILE)" "" $(EXECUTABLE_DIR)/%: - endif +endif - ifeq "$(NO_COMPILE)" "" +ifeq "$(NO_COMPILE)" "" $(EXECUTABLE_DIR)/%: $(OBJECT_DIR)/%.obj $(ACTUAL_OBJECTS:%=$(OBJECT_DIR)/%) $(ACTUAL_LOCAL_LIBS:%=$(STATIC_LIBRARY_DIR)/$(LIB_PREFIX)%$(LIB_ENDING)) $(PARAMETER_FILE) $(HIDER)echo Building Application [$(notdir $@)] @echo $@ >$(DIRTY_FILE) $(CATCHER)$(LINK_TOOL) $(EXE_FLAGS) $(LOAD_FLAG_PREFIX) $< $(ACTUAL_OBJECTS:%=$(OBJECT_DIR)/%) $(ACTUAL_LOCAL_LIBS:%=$(LIBRARY_NAME_FLAG)%) $(LOAD_FLAG_SUFFIX) $(LINKER_OUTPUT_FLAG)$@ #hmmm: experimental item below. #$(^:force_rebuild=) - endif #no_compile -#endif #unix +endif #no_compile ############################################################################ diff --git a/scripts/clam/cpp/variables.def b/scripts/clam/cpp/variables.def index 62c097f6..4668e33c 100644 --- a/scripts/clam/cpp/variables.def +++ b/scripts/clam/cpp/variables.def @@ -21,16 +21,6 @@ include variables.def ############################################################################### -#no # set the repository directory if it is still set to the base version. -#ifeq "$(FEISTY_MEOW_APEX)" "" -# ifeq "$(OP_SYSTEM)" "UNIX" -# export FEISTY_MEOW_APEX = $(HOME)/hoople -# endif -# ifeq "$(OP_SYSTEM)" "WIN32" -# export FEISTY_MEOW_APEX = l: -# endif -#endif - #export CLAM_BINARIES = $(CLAM_SCRIPTS)/../bin ############################################################################### @@ -42,18 +32,7 @@ export BASE_CPU # set the CPU to a default if it has not been set previously. ifeq "$(BASE_CPU)" "" -# ifneq "$(OP_SYSTEM)" "WIN32" - BASE_CPU := $(shell machine 2>/dev/null || arch 2>/dev/null || uname -m 2>/dev/null || echo i686) -# endif - -# ifeq "$(BASE_CPU)" "" -# BASE_CPU := $(shell uname -m) -# BASE_CPU := $(shell arch) -# ifeq "$(BASE_CPU)" "" -# # failed to get the cpu type. -# BASE_CPU := x86 -# endif -# endif + BASE_CPU := $(shell machine 2>/dev/null || arch 2>/dev/null || uname -m 2>/dev/null || echo i686) endif # COMPILER is a flag that specifies the compiler that will be used to build @@ -61,7 +40,6 @@ endif # compiler flags. export COMPILER #COMPILER := GNU_LINUX | GNU_ARM_LINUX | GNU_DARWIN | GNU_WINDOWS -##| VISUAL_CPP # choose a default compiler if none was specified. ifeq "$(COMPILER)" "" @@ -74,7 +52,6 @@ ifeq "$(COMPILER)" "" endif ifeq "$(OP_SYSTEM)" "WIN32" COMPILER := GNU_WINDOWS -# COMPILER := VISUAL_CPP endif ifeq "$(COMPILER)" "" # if we get into this case, we have no idea how to set the default @@ -424,13 +401,13 @@ ifeq "$(OP_SYSTEM)" "UNIX" DYNLIB_ENDING = .so endif ifeq "$(OP_SYSTEM)" "WIN32" - ifeq "$(COMPILER)" "VISUAL_CPP" - LIB_ENDING = .lib - DYNLIB_ENDING = .dll - else +#hmmm: question here about what we build for dynamic, which is currently broken. +# LIB_ENDING = .lib +# DYNLIB_ENDING = .dll +# else LIB_ENDING = .a DYNLIB_ENDING = .so - endif +# endif endif ############################################################################### @@ -463,9 +440,7 @@ endif # compiler specific section below. ############################################################################ -# wide open match of any compiler besides gnu darwin. -#hmmm: this will erroneously match the arm one. but have we used that in a while? -ifneq "$(COMPILER)" "GNU_DARWIN" +ifeq "$(COMPILER)" "GNU_LINUX" # Unix GNU compiler... CC = g++ COMPILER_ROOT_DIR = / @@ -635,289 +610,6 @@ endif ############################################################################ -ifeq "$(COMPILER)" "VISUAL_CPP" - # microsoft visual c++ 4.x, 5.x or 6.x. - -bork bork should not be here. - - PLATFORM_ADD_IN = w32_ - - TRIPART_VERSION = - - CLEANUPS += $(PDB_DIR)/$(PROJECT)_bookkeeping.pdb -#hmmm: import libs for dynamic libraries on ms-win32 do not currently get -# cleaned up nicely. - - # ensure that any setting for this is seen by sub-shells. - export WIN32_MANIFEST_FILE - - # these define special characteristics for a program being built. - # BASE is almost always defined and pulls in fundamental w32 support. - # RPC supplies the remote procedure call libraries. - # SECURITY links with the w32 security APIs. - # CLR sets options that are appropriate for managed code. - VCPP_USE_BASE=true - VCPP_USE_RPC= - VCPP_USE_OLE= - VCPP_USE_SECURITY= - VCPP_USE_CLR= - VCPP_VISTA_ICON= - - # the framework dir points at the .net framework to be used for compilation. - ifeq "$(FRAMEWORK_VERSION)" "" - - # older .net 1.1. -# SHORT_FRAMEWORK_VERSION = 1.1 -# FRAMEWORK_VERSION = $(SHORT_FRAMEWORK_VERSION).4322 - - # current .net 2.0. - SHORT_FRAMEWORK_VERSION = 2.0 - FRAMEWORK_VERSION = $(SHORT_FRAMEWORK_VERSION).50727 - endif - ifeq "$(FRAMEWORK_DIR)" "" - FRAMEWORK_DIR = $(subst \,/,$(WINDIR))/Microsoft.NET/Framework/v$(FRAMEWORK_VERSION) - endif - - # calculate the visual studio root directory. - ifeq "$(VIS_STU_ROOT)" "" - export VIS_STU_ROOT := $(shell $(SHELL) $(CLAM_SCRIPTS)/cpp/ms_root_dir.sh ) - endif - ifneq "$(VIS_STU_ROOT)" "" - export COMPILER_ROOT_DIR = $(VIS_STU_ROOT)/VC - endif - ifeq "$(COMPILER_ROOT_DIR)" "" - HOSEUP = $(shell echo The compiler directory is not set. Please define the environment variable) - HOSEUP = $(shell echo VSxCOMNTOOLS (x=80, 90 or 100) to point at the folder where visual ) - HOSEUP = $(shell echo Studio is installed.) - HOSEUP = - endif - - # redo the compiler version with our new info. - export COMPILER_VERSION := $(shell $(SHELL) $(CLAM_SCRIPTS)/cpp/get_version.sh $(COMPILER) $(COMPILER_ROOT_DIR) ) - - # set up a directory for debugging files to be stored. these are not - # moved with the postconditions--they are generated in place. - export PDB_DIR = $(TARGETS_STORE) - - # set these way up here so we can override them later. - CC = $(BUILD_SCRIPTS_PATH)/wrapdoze.sh $(COMPILER_ROOT_DIR)/bin/cl.exe - LINK_TOOL = $(BUILD_SCRIPTS_PATH)/wrapdoze.sh $(COMPILER_ROOT_DIR)/bin/link.exe - LIBRARY_TOOL = $(BUILD_SCRIPTS_PATH)/wrapdoze.sh $(COMPILER_ROOT_DIR)/bin/lib - - # This is needed to protect against the use of 64-bit time_t structure - # on windows. We are casting to time_t from a 32-bit structure. - DEFINITIONS += _USE_32BIT_TIME_T - - # vary the locations for compiler files based on the version. - ifeq "$(COMPILER_VERSION)" "6" - COMPILER_HEADER_DIR = $(COMPILER_ROOT_DIR)/include $(COMPILER_ROOT_DIR)/atl/include - COMPILER_LIBRARY_DIR = $(COMPILER_ROOT_DIR)/lib $(COMPILER_ROOT_DIR)/atl/lib - RC = $(BUILD_SCRIPTS_PATH)/wrapdoze.sh $(COMPILER_ROOT_DIR)/../common/msdev98/bin/rc - endif - ifeq "$(COMPILER_VERSION)" "7" - COMPILER_HEADER_DIR = $(COMPILER_ROOT_DIR)/include $(COMPILER_ROOT_DIR)/atlmfc/include $(COMPILER_ROOT_DIR)/platformsdk/include $(FRAMEWORK_DIR) - COMPILER_LIBRARY_DIR = $(COMPILER_ROOT_DIR)/lib $(COMPILER_ROOT_DIR)/atlmfc/lib $(COMPILER_ROOT_DIR)/platformsdk/lib - RC = $(BUILD_SCRIPTS_PATH)/wrapdoze.sh $(COMPILER_ROOT_DIR)/bin/rc - COMPILER_FLAGS += -Zc:forScope - # turn on proper loop scoping. - endif - ifeq "$(COMPILER_VERSION)" "8" - COMPILER_HEADER_DIR = $(COMPILER_ROOT_DIR)/include $(COMPILER_ROOT_DIR)/atlmfc/include $(COMPILER_ROOT_DIR)/platformsdk/include $(FRAMEWORK_DIR) - COMPILER_LIBRARY_DIR = $(COMPILER_ROOT_DIR)/lib $(COMPILER_ROOT_DIR)/atlmfc/lib $(COMPILER_ROOT_DIR)/platformsdk/lib - RC = $(BUILD_SCRIPTS_PATH)/wrapdoze.sh $(COMPILER_ROOT_DIR)/bin/rc - COMPILER_FLAGS += -Zc:forScope - # turn on proper loop scoping. - DEFINITIONS += _WIN32_WINNT=0x501 - DEPENDENCY_DEFINITIONS += _WIN32_WINNT=0x501 - endif -# -# ver 9 (vis stu 2008) is not in here but is probably similar to 8 or 10. -# - ifeq "$(COMPILER_VERSION)" "10" - export PLATYPUS = $(WindowsSdkDir) - COMPILER_HEADER_DIR = $(COMPILER_ROOT_DIR)/include $(COMPILER_ROOT_DIR)/atlmfc/include $(PLATYPUS)/include -## $(FRAMEWORK_DIR) - COMPILER_LIBRARY_DIR = $(COMPILER_ROOT_DIR)/lib $(COMPILER_ROOT_DIR)/atlmfc/lib $(PLATYPUS)/lib - DEFINITIONS += _WIN32_WINNT=0x501 - DEPENDENCY_DEFINITIONS += _WIN32_WINNT=0x501 - RC = $(BUILD_SCRIPTS_PATH)/wrapdoze.sh $(PLATYPUS)/bin/rc - COMPILER_FLAGS += -Zc:forScope - # turn on proper loop scoping. - endif - ifeq "$(COMPILER_HEADER_DIR)" "" - HOSEUP = $(shell echo The compiler version is not set. Please define COMPILER_VERSION.) - endif - ifeq "$(COMPILER_HEADER_DIR)" "" - HOSEUP = $(shell echo The compiler version is not set. Please define COMPILER_VERSION.) - endif - ifeq "$(COMPILER_HEADER_DIR)" "0" - HOSEUP = $(shell echo The compiler version is not set. Please define COMPILER_VERSION.) - endif - - # add in the mfc directories. - COMPILER_HEADER_DIR += $(COMPILER_ROOT_DIR)/mfc/include - COMPILER_LIBRARY_DIR += $(COMPILER_ROOT_DIR)/mfc/lib - - DEFINITIONS += _Windows _WINDOWS WIN32 __WIN32__ __FLAT__ VC_EXTRALEAN WIN32_LEAN_AND_MEAN ATL_NO_LEAN_AND_MEAN - DEF_FILE = - LOAD_FLAG_PREFIX = -subsystem:windows -machine:X86 -nologo - LOAD_FLAG_SUFFIX = - - MIDL = "$(COMPILER_ROOT_DIR)/../Common7/Tools/Bin"/midl.exe -Oicf $(MIDL_DEFS) $(HEADER_SEARCH_PATH:%=-I% ) $(DEFINITIONS:%=-D% ) - MIDL_DEFS = -no_robust - - # additional definitions that get put on the command line for makedep. these - # are needed since visual c++ defines them automatically. - DEPENDENCY_DEFINITIONS += __cplusplus _WIN32 _CHAR_UNSIGNED M_I86 _M_I86 _MSC_VER=1200 _M_IX86=500 __RPC_WIN32__ __RPCNDR_H_VERSION__ __RPCPROXY_H_VERSION__ TARGET_IS_NT40_OR_LATER PGM_SETCHILD _MFC_VER=0x0600 - - # set the flags used by visual c++. - CREATE_LIBRARY_FLAG = -out: - LIBRARY_NAME_FLAG = - LIBRARY_PATH_FLAG = -libpath: - LINKER_OPTION_SEPARATOR = -link - LINKER_OUTPUT_FLAG = -out: - OBJECT_NAME_FLAG = -Fo - - # Add the extra files created by visual c++. -#is this needed now that we whack whole output path? CLEANUPS += $(OUTPUT_PATH)/*.*db - - # compilation parameters for microsoft. - # -c specifies compilation without linking. - # -EHsc is the flag for turning on exception handling. - # -FD is for getting the best dependency checking in visual studio. - # -Fd[filename] names the program database (PDB) file used for debugging. - # -Fp[filename] names the precompiled header file name. - # -FR[filename] names the browser output path used for source analysis. - # -Gd calling convention is cdecl. - # -Gm enables minimal rebuild (only if source files changed). - # Note! as of Visual Studio 6 SP 3, minimal rebuild does not work - # properly. Do not use it unless you want inconsistent builds! - # -GR enables run-time type identification (RTTI). - # -GS enables buffer checking. - # -GX turns on synchronous exception handling. (deprecated) - # -Gz uses __stdcall calling convention. - # -MD specifies multi-threaded DLL (MDd means debug). - # -ML signifies uni-threaded executable (MLd means debug). - # -MT indicates multi-threaded executable (MTd means debug) - # -O is for optimization (1 small code, 2 fast code, d disabled). - # do not use 1 or 2 though; they both include "global optimization", - # which seems plagued with problems. the specific optimizations are: - # -Oa assume no aliasing - # -Obn inline function expansion, where n is 1 (enable) or 0 (disable) - # -Od disable (for debug) - # -Oi generate intrinsic functions - # -Og global optimizations (flawed) - # -Op improve float consistency - # -Os favor small code - # -Ot favor fast code - # -Ow assume aliasing across function calls - # -Ox full optimization - # -Oy frame pointer optimization - # -O1 has g s y b1 Gs Gf Gy - # -O2 has g i t y b1 Gs Gf Gy - # -TP C++ compilation. - # -W sets the warning level (from 0 (least warnings) through 4 (loudest)). - # -WX turns all warnings into errors. - # -Yu[filename] uses a precompiled header file. - # -YX turns on precompiled headers. not used due to poor implementation. - # -Zi generates debugging information into the PDB file. - - # put the common flags into the compiler flags. - COMPILER_FLAGS += -nologo -Fd$(PDB_DIR)/$(PROJECT)_bookkeeping.pdb -GR -W3 -Zi -EHsc -GS -Gd -#-Wp64 - - ifneq "$(DEBUG)" "" - # disable function inlining and optimizations for debug. - COMPILER_FLAGS += -Ob0 -Od - else - # enable function inlining for release only. - COMPILER_FLAGS += -Ob1 - - ifneq "$(OPTIMIZE)" "" - # add in fast code optimization. - COMPILER_FLAGS += -O2 - else - # no optimizations. - endif - - endif - - # linking parameters for microsoft. - # -dll specifies that a dynamic library is to be created. - # -debug specifies that debugging information is to be included. - # -map turns on the map file. - # -warn sets the warning level, from 0 to 3, where 3 is the most verbose. - # kernel32.lib is the kernel support. - # user32.lib is the user level support. - # gdi32.lib is the graphical device interface? support. - # winspool.lib contains printer support. - # comdlg32.lib provides the common dialogs. - # advapi32.lib provides deeper win32 features, like registry, services, etc. - # shell32.lib is ? - # ole32.lib supplies OLE support. - # oleaut32.lib is the OLE automation library. - # uuid.lib has unique id management? - # odbc32.lib provides ODBC data source functionality. - # odbccp32.lib is something? - # winmm.lib has the win32 multimedia support. - # version.lib offers up splendid version services. - - # check if profiling is to be enabled. - PROFILER_FLAG = - ifneq "$(PROFILE)" "" - PROFILER_FLAG = -profile - endif - - LIBS_USED += htmlhelp.lib - - # add the common linker flags. the debugging flag is added because we - # want to be able to debug into release code, but since the pdb files - # are separate, we are not exposing ourselves when we do not include them. - LOAD_FLAG_PREFIX += $(PROFILER_FLAG) -debug -opt:ref -opt:icf -#-warn:3 - - # "USE_MFC" dictates whether mfc should be allowed in the application. - # the default is not to use MFC extension style dlls. this can be turned - # on in the individual makefiles that require MFC. - #USE_MFC = - - # the library creator gets a couple of flags. - LIBRARIAN_FLAGS += -nologo -machine:X86 -subsystem:windows - - # now, vary the flag configuration based on the flags that have been set. - -####override for windows since things are broken with WinMain -###export CONSOLE_MODE = true - - ifneq "$(CONSOLE_MODE)" "" - # console type of applications are built using the static flag so that - # they are more redistributable. - DEFINITIONS += _CONSOLE - LOAD_FLAG_SUFFIX += -subsystem:console - LIBRARIAN_FLAGS += -subsystem:console - endif - - # dynamically linked library or application flags. - ifneq "$(DEBUG)" "" - # debug. - DEFINITIONS += _DEBUG - COMPILER_FLAGS += -MDd - else - # release. - DEFINITIONS += NDEBUG - COMPILER_FLAGS += -MD - LOAD_FLAG_PREFIX += -map - endif - - ifneq "$(STRICT_WARNINGS)" "" - COMPILER_FLAGS += -WX -#would like to add W4 but that triggers warnings in microsoft headers. - endif - -endif - -############################################################################ - ifeq "$(COMPILER)" "GNU_DARWIN" # Darwin kernel GNU compiler... really more general macos (MacOS) here these days. CC = g++ diff --git a/scripts/clam/cpp/vis_stu/trap_new.addin b/scripts/clam/cpp/vis_stu/trap_new.addin deleted file mode 100644 index 2cce3945..00000000 --- a/scripts/clam/cpp/vis_stu/trap_new.addin +++ /dev/null @@ -1,7 +0,0 @@ -// this should be included before the first use of new in a header. - -#ifdef new - #undef new - #define NEW_TRAP -#endif - diff --git a/scripts/clam/cpp/vis_stu/untrap_new.addin b/scripts/clam/cpp/vis_stu/untrap_new.addin deleted file mode 100644 index 393b01b2..00000000 --- a/scripts/clam/cpp/vis_stu/untrap_new.addin +++ /dev/null @@ -1,15 +0,0 @@ - -// this should be included after the last usage of new that must be protected. - -#ifdef NEW_TRAP - #undef NEW_TRAP - #ifndef ENABLE_MEMORY_HOOK - #define new DEBUG_NEW - #else - #define new HOOPLE_NEW - #endif -#endif - - - - diff --git a/scripts/clam/dotnet-retired/csharper.sh b/scripts/clam/dotnet-retired/csharper.sh deleted file mode 100644 index ec476037..00000000 --- a/scripts/clam/dotnet-retired/csharper.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -declare -a flipped=() -for i in $*; do - flip=$(echo $i | sed -e 's/\/\([a-zA-Z]\)\//\1:\//' | tr '/' '\\') - flipped+=($flip) -done -${FRAMEWORK_DIR}/csc ${flipped[*]} - diff --git a/scripts/clam/dotnet-retired/postconditions.sh b/scripts/clam/dotnet-retired/postconditions.sh deleted file mode 100644 index 9d145243..00000000 --- a/scripts/clam/dotnet-retired/postconditions.sh +++ /dev/null @@ -1,107 +0,0 @@ -#!/bin/bash -# copies the final products of the current project into the repository. - -# check whether a failure should prevent promotion from occurring. -if [ -f $FAILURE_FILE ]; then - echo Postconditions will not promote due to a failure: - cat $FAILURE_FILE - . $CLAM_SCRIPTS/exit_make.sh -fi - -# make sure that we actually did something during the make. -if [ ! -f "$DIRTY_FILE" -a ! -f "$SUBMAKE_FLAG" ]; then - # nothing was built, seemingly, so we do no promotion. - exit -fi - -# toss the flag files so we don't see them again. -rm -f "$DIRTY_FILE" "$SUBMAKE_FLAG" - -# clean up generated resource files after the build. -for i in *.resources; do rm -f "$i"; done - -# these variables define the locations for final products. all of them -# descend from the root of the repository. -ROOT=$TARGETS_STORE -LIB_DIR=$ROOT/lib -DLL_DIR=$ROOT/dll -EXE_DIR=$ROOT/exe -TEST_ROOT=$ROOT/tests -TEST_DIR=$TEST_ROOT/$PROJECT - -# causes the shell to quit. -DIE=". $CLAM_SCRIPTS/exit_make.sh" - -if [ "$TYPE" = "library" ]; then - - # make sure the required directories exist. - if [ ! -d $ROOT ]; then mkdir -p $ROOT; fi - if [ ! -d $LIB_DIR ]; then mkdir $LIB_DIR; fi - if [ ! -d $DLL_DIR ]; then mkdir $DLL_DIR; fi - - if [ -z "$NO_COMPILE" ]; then - # we ensure that none of the normal products are copied for a non-compiling - # style of project. - - # copy the import libraries for any DLLs. - if [ ! -z "`$FIND "$DYNAMIC_LIBRARY_DIR" -iname "*.lib"`" ]; then - echo Moving import libraries to $LIB_DIR. - mv "$DYNAMIC_LIBRARY_DIR"/*.lib $LIB_DIR - fi - - fi - -elif [ "$TYPE" = "application" ]; then - - # sets up the directory for executable programs and copies any found in the - # this project's final directory. - - # first make sure the executable directory is around. - if [ ! -d $EXE_DIR ]; then mkdir $EXE_DIR; fi - - if [ -z "$NO_COMPILE" ]; then - # we ensure that none of the normal products are copied for a non-compiling - # style of project. - - # copy anything extra over. - if [ ! -z "$EXTRA_COPIES" ]; then - echo Copying extra files to $EXE_DIR. - echo [$EXTRA_COPIES] - cp -f $EXTRA_COPIES $EXE_DIR || $DIE - fi - - fi - -elif [ "$TYPE" = "test" ]; then - - # sets up a directory for test programs based on the project name and copies - # the generated programs into there. - - # first make sure the test program root directory is around. - if [ ! -d $TEST_ROOT ]; then mkdir $TEST_ROOT; fi - - # create the target directory if it doesn't exist. - if [ ! -d $TEST_DIR ]; then mkdir $TEST_DIR; fi - - if [ -z "$NO_COMPILE" ]; then - # we ensure that none of the normal products are copied for a non-compiling - # style of project. - - # make the files writable. this is required for some tests' data files, - # which come in from the build and could be read-only. - chmod 777 $TEST_DIR/* $TEST_DIR/*/* $TEST_DIR/*/*/* >/dev/null 2>&1 - - # copy anything extra over. - if [ ! -z "$EXTRA_COPIES" ]; then - echo Copying extra files to $TEST_DIR. - echo [$EXTRA_COPIES] - cp -f $EXTRA_COPIES $TEST_DIR || $DIE - fi - - fi - -else - echo "Unknown type for project [$TYPE]; cancelling postconditions!" - . $CLAM_SCRIPTS/exit_make.sh -fi - diff --git a/scripts/clam/dotnet-retired/preconditions.sh b/scripts/clam/dotnet-retired/preconditions.sh deleted file mode 100644 index cdf66d75..00000000 --- a/scripts/clam/dotnet-retired/preconditions.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash -# prepares the project for compilation by creating the appropriate directories. - -# make sure the top-level repository exists. -if [ ! -d $FEISTY_MEOW_APEX ]; then mkdir -p $FEISTY_MEOW_APEX; fi -# make sure our temp directory is there. -if [ ! -d $CLAM_TMP ]; then mkdir -p $CLAM_TMP; fi -# make sure the generated files have a home. -if [ ! -d $TARGETS_STORE ]; then mkdir -p $TARGETS_STORE; fi -# create the generated files storage area. -if [ ! -d $OUTPUT_ROOT ]; then mkdir -p $OUTPUT_ROOT; fi -# create the top level object directory if it doesn't exist. -if [ ! -d $BASE_OUTPUT_PATH ]; then mkdir -p $BASE_OUTPUT_PATH; fi -# create the project level object directory if it is non-existent. -if [ ! -d $OUTPUT_PATH ]; then mkdir -p $OUTPUT_PATH; fi -# create a directory to hold any debugging files, if necessary. -if [ ! -d $PDB_DIR ]; then mkdir -p $PDB_DIR; fi -# -if [ ! -d $TESTS_DIR ]; then mkdir -p $TESTS_DIR; fi -# -if [ ! -d $EXECUTABLE_DIR ]; then mkdir -p $EXECUTABLE_DIR; fi -# -if [ ! -d $DYNAMIC_LIBRARY_DIR ]; then mkdir -p $DYNAMIC_LIBRARY_DIR; fi -# -if [ ! -d $STATIC_LIBRARY_DIR ]; then mkdir -p $STATIC_LIBRARY_DIR; fi - -# set versions on any extras that were specified in the makefile. -if [ ! -z "$EXTRA_VERSIONS" ]; then - for i in $EXTRA_VERSIONS; do $CLAM_BINARIES/version_stamper$EXE_END $i $PARAMETER_FILE; done -fi - -# create all the directories that objects will go into. -###for i in $OUTPUT_DIRECTORY_LIST; do -### if [ ! -d "$OUTPUT_PATH/$i" ]; then mkdir "$OUTPUT_PATH/$i"; fi -###done - -# for firmware compilations set the compiler to the correct processor platform -if [ "$COMPILER" = "DIAB" ]; then - $COMPILER_CONTROL $COMPILER_CONTROL_FLAGS -fi - diff --git a/scripts/clam/dotnet-retired/readme.txt b/scripts/clam/dotnet-retired/readme.txt deleted file mode 100644 index abe066a5..00000000 --- a/scripts/clam/dotnet-retired/readme.txt +++ /dev/null @@ -1,9 +0,0 @@ - - -this is out of date! - -it used to compile c# assets on windows pretty well. -now it probably does nothing. - -we intend to refurbish it for use with mono. - diff --git a/scripts/clam/dotnet-retired/rules.def b/scripts/clam/dotnet-retired/rules.def deleted file mode 100644 index 9ab0aaaf..00000000 --- a/scripts/clam/dotnet-retired/rules.def +++ /dev/null @@ -1,262 +0,0 @@ -############################################################################### - -# CLAM System default rules and targets for C++ compilation. - -# This file composite macros and rules for creating compilation objects -# (such as library archives, object files, executable programs, and others). - -# This file should be included in the user's Makefile after the variables -# have been initialized appropriately for the particular project being -# compiled. The user's own targets should be placed after the include -# directive that specifies this file. - -############################################################################### - -# This section manipulates variable values to prepare them for their use -# in the standard CLAM support. - -# Modify the output directory for executable files if we're building a -# test project. -ifeq "$(TYPE)" "test" - EXECUTABLE_DIR = $(TARGETS_STORE)/tests/$(PROJECT) - ifneq "$(CONSOLE_MODE)" "" - COMPILER_FLAGS += -target:exe - else - COMPILER_FLAGS += -target:winexe - endif -endif -ifeq "$(TYPE)" "application" - ifneq "$(CONSOLE_MODE)" "" - COMPILER_FLAGS += -target:exe - else - COMPILER_FLAGS += -target:winexe - endif -endif -ifeq "$(TYPE)" "library" - COMPILER_FLAGS += -target:library -endif - -# prep the actual source variable so that certain file names are translated. -ACTUAL_RESX = $(RESX:%.resx=%.resources) - -ifeq "$(OP_SYSTEM)" "WIN32" - ifneq "$(OMIT_VERSIONS)" "" - # remove version rc files if we're not dealing with versions. - ACTUAL_RESOURCE = $(RESOURCE:%.rc=) - else - ACTUAL_RESOURCE = $(RESOURCE:%.rc=%.res) - endif -else - # replace this when supporting resource files on unix. - ACTUAL_RESOURCE = $(RESOURCE:%.rc=) -endif - -# patch the sources so that subdirs work. -ACTUAL_SOURCE = $(SOURCE:%.cs=$(CURRENT_DIR)/%.cs) - -# visual studio settings. -ifeq "$(COMPILER)" "VISUAL_CPP" - # processes the def file for linkage, if one has been specified. - ifneq "$(DEF_FILE)" "" - LOAD_FLAG_PREFIX += -def:$(DEF_FILE) - endif - - # these are loaded after any special debugging libs. - ifneq "$(VCPP_USE_BASE)" "" - # the first set will be included in almost any old program. we include - # winmm for multimedia in the base support since we make heavy use of the - # more accurate uptime function. -# LOAD_FLAG_PREFIX += advapi32.lib kernel32.lib version.lib winmm.lib - endif -#is advapi32 really part of the base required stuff? will it work on -#win98? how about win95? - - ifneq "$(VCPP_USE_GUI)" "" - LOAD_FLAG_PREFIX += comdlg32.lib gdi32.lib user32.lib winspool.lib - endif - - ifneq "$(VCPP_USE_OLE)" "" - LOAD_FLAG_PREFIX += ole32.lib oleaut32.lib uuid.lib - VCPP_USE_RPC = t - endif - ifneq "$(VCPP_USE_RPC)" "" - LOAD_FLAG_PREFIX += rpcndr.lib rpcns4.lib rpcrt4.lib - VCPP_USE_SOCK = t - endif - ifneq "$(VCPP_USE_SOCK)" "" - LOAD_FLAG_PREFIX += netapi32.lib ws2_32.lib - endif -endif - -# Updates the search path for the compiler and local libraries. -BASE_HEADER_PATH = $(CODEBASE_HEADERS) $(LOCAL_HEADERS) $(HOOPLE_HEADERS) $(SEARCH_DIRS) -HEADER_SEARCH_PATH += $(BASE_HEADER_PATH) $(COMPILER_HEADER_DIR) - -LIBRARY_SEARCH_PATH += $(LOCAL_LIBRARIES) $(HOOPLE_LIBRARIES) \ - $(STATIC_LIBRARY_DIR) $(COMPILER_LIBRARY_DIR) $(SEARCH_DIRS) - -# Adds some directories that must be searched onto the search path for -# header files, such as the compiler's own special header file directory. -COMPILER_FLAGS += $(DEFINITIONS:%=-D:%) $(UNDEFINITIONS:%=-U%) -#$(HEADER_SEARCH_PATH:%=-I%) - -# The load flags are updated by looking for code libraries in the directories -# to search and by adding all of the code libraries that are used. -LOAD_FLAG_PREFIX += $(LIBRARY_SEARCH_PATH:%=$(LIBRARY_PATH_FLAG)%) -LOAD_FLAG_PREFIX += $(LIBS_USED:%=$(LIBRARY_NAME_FLAG)%) - -# prepare for mfc style DLLs. currently we plan on all dlls we create being -# based on MFC. this is an unfortunate requirement for using the mfc debug -# support for allocations; if regular new and DEBUG_NEW get mixed together, -# crashes used to result. supposedly these are gone now at least. -ifneq "$(USE_MFC)" "" - # set the flag that says we are doing mfc extension dlls. - DEFINITIONS += _AFXDLL - - # add in the mfc directories. - COMPILER_HEADER_DIR += $(COMPILER_ROOT_DIR)/mfc/include - COMPILER_LIBRARY_DIR += $(COMPILER_ROOT_DIR)/mfc/lib -endif - -ifeq "$(OMIT_VERSIONS)" "" - ifneq "$(VERSION_RC_ROOT)" "" - VERSION_TARGET = $(VERSION_RC_ROOT)_version.rc - endif -endif - -# Make sure that the directory for objects exists. -ACTUAL_FIRST_TARGETS = check_requirements $(VERSION_TARGET) $(FIRST_TARGETS) pre_compilation - -# Adds the primary targets to the list of products to create. -ACTUAL_TARGETS1 = $(TARGETS:%.exe=$(EXECUTABLE_DIR)/%.exe) -ACTUAL_TARGETS2 = $(ACTUAL_TARGETS1:%.dll=$(DYNAMIC_LIBRARY_DIR)/%.dynlibrary) -ACTUAL_TARGETS3 = $(ACTUAL_TARGETS2:%.so=$(DYNAMIC_LIBRARY_DIR)/%.so) -ACTUAL_TARGETS4 = $(ACTUAL_TARGETS3:%.lib=$(STATIC_LIBRARY_DIR)/%.library) -ACTUAL_TARGETS = $(ACTUAL_TARGETS4:%.elf=$(EXECUTABLE_DIR)/%.elf) - -# Adds the last few targets for CLAM to do. -ACTUAL_LAST_TARGETS = post_compilation $(LAST_TARGETS) - -############################################################################ - -# This section defines the rules used to generate various objects from their -# source files. - -############################################################################ - -# resource compiler for c#. - -%.resources: %.resx - @echo Creating resource file [$@]. - $(RC) $< $@ -# $(CATCHER)$(RC) $< $@ - -############################################################################ - -# resource compiler for standard resource files. - -ifeq "$(OP_SYSTEM)" "WIN32" -%.res: %.rc - @echo Creating resource file [$@]. -ifeq "$(NO_COMPILE)" "" - $(CATCHER)$(STANDARD_RC) -r $(DEFINITIONS:%=-D%) $(HEADER_SEARCH_PATH:%=-i%) -fo $@ $< -endif -endif - -############################################################################ - -# creates dynamic libraries. - -# we whack any existing LIB file, since we want to use changes in that file -# as a clue for when we should rescan the dependencies. we'd be fine if -# visual c++ didn't keep an existing LIB if it doesn't change (even when the -# DLL does). - -$(DYNAMIC_LIBRARY_DIR)/%.dynlibrary: $(LOCAL_LIBS_USED:%=$(DYNAMIC_LIBRARY_DIR)/$(LIB_PREFIX)%$(LIB_ENDING)) $(ACTUAL_RESX) $(ACTUAL_SOURCE) $(ACTUAL_RESOURCE) - $(HIDER)echo Creating dynamic library [$@]. - @echo $@ >$(DIRTY_FILE) - $(HIDER)rm -f $(@:%.dll=%.lib) - $(CATCHER)$(CC) $(COMPILER_FLAGS) $(EXE_FLAGS) $(LOAD_FLAG_PREFIX) $(LOCAL_LIBS_USED:%=$(LIBRARY_NAME_FLAG)$(DYNAMIC_LIBRARY_DIR)/$(LIB_PREFIX)%$(LIB_ENDING)) $(LOAD_FLAG_SUFFIX) $(LINKER_OUTPUT_FLAG)$@ $(ACTUAL_SOURCE) $(ACTUAL_RESX:%=-res:%) $(ACTUAL_RESOURCE:%=-win32res:%) -ifneq "$(VCPP_VISTA_ICON)" "" - $(HIDER)ReplaceVistaIcon "$@" "$(VCPP_VISTA_ICON)" -endif - $(HIDER)mv $@ $(DYNAMIC_LIBRARY_DIR)/$(LIB_PREFIX)$*$(LIB_ENDING) -ifneq "$(CREATE_TLB)" "" - $(CATCHER)$(TLBEXPORT) $(DYNAMIC_LIBRARY_DIR)/$(LIB_PREFIX)$*$(LIB_ENDING) -out:$(DYNAMIC_LIBRARY_DIR)/$(LIB_PREFIX)$*.tlb -endif - $(HIDER)echo nil >$@ - -#$(LINKER_OUTPUT_FLAG)$@ -dll $(LOAD_FLAG_PREFIX) $(ACTUAL_OBJECTS:%=$(OBJECT_DIR)/%) $(LOCAL_LIBS_USED:%=$(LIBRARY_NAME_FLAG)$(LIB_PREFIX)%$(LIB_ENDING)) $(LOAD_FLAG_SUFFIX) - -############################################################################ - -# creates "exe" executables using all of the appropriate objects. -$(EXECUTABLE_DIR)/%.exe: $(LOCAL_LIBS_USED:%=$(DYNAMIC_LIBRARY_DIR)/$(LIB_PREFIX)%$(LIB_ENDING)) $(ACTUAL_RESX) $(ACTUAL_SOURCE) $(ACTUAL_RESOURCE) - $(HIDER)echo Building program [$@]. - @echo $@ >$(DIRTY_FILE) - $(CATCHER)$(CC) $(COMPILER_FLAGS) $(EXE_FLAGS) $(LOAD_FLAG_PREFIX) $(LOCAL_LIBS_USED:%=$(LIBRARY_NAME_FLAG)$(DYNAMIC_LIBRARY_DIR)/$(LIB_PREFIX)%$(LIB_ENDING)) $(LOAD_FLAG_SUFFIX) $(LINKER_OUTPUT_FLAG)$@ $(ACTUAL_SOURCE) $(ACTUAL_RESX:%=-res:%) $(ACTUAL_RESOURCE:%=-win32res:%) -ifneq "$(VCPP_VISTA_ICON)" "" - $(HIDER)ReplaceVistaIcon "$@" "$(VCPP_VISTA_ICON)" -endif - -############################################################################ - -# handles creating version resource files if this project has a version.ini. - -ifeq "$(OMIT_VERSIONS)" "" - ifneq "$(VERSION_RC_ROOT)" "" -# only redo the version resource if it or version.ini is out of date. -%_version.rc: version.ini $(PARAMETER_FILE) - $(CATCHER)$(CLAM_BINARIES)/version_stamper$(EXE_END) . $(PARAMETER_FILE) - endif -endif - -############################################################################ - -# Now the active part of the make process... - -# Adds the main CLAM system in to get some work done. This should be placed -# after the module's rules are defined and before the module's targets are -# defined. -include rules.def - -# preserves intermediate files from being deleted. -##.PRECIOUS: %.resources - -# zaps things when they could not be created correctly. -.DELETE_ON_ERROR: - -############################################################################ - -# examines the required variables and complains if they're missing. -check_requirements: - $(HIDESH) -c 'if [ -z "$(PROJECT)" ]; then echo the PROJECT variable is not defined!; . $(CLAM_SCRIPTS)/exit_make.sh; fi' - $(HIDESH) -c 'if [ -z "$(TYPE)" ]; then echo the TYPE variable is not defined!; . $(CLAM_SCRIPTS)/exit_make.sh; fi' - -############################################################################ - -# calls the script for preparing output directories and such. -pre_compilation: - $(HIDESH)$(CLAM_SCRIPTS)/csharp/preconditions.sh - -############################################################################ - -# calls the script for copying the final products to the library directory. -# we don't bother reporting errors from touch since there will sometimes -# not be any objects in the final directory. -post_compilation: - $(HIDESH)$(CLAM_SCRIPTS)/csharp/postconditions.sh - -############################################################################ - -# if REBUILD is defined, then we cause all objects to be recompiled. -.PHONY: force_rebuild -force_rebuild: - -ifneq "$(REBUILD)" "" - # the target below needs the blank rule that it has for this to work. - $(FIRST_TARGETS) $(ACTUAL_OBJECTS:%=$(OBJECT_DIR)/%) $(ACTUAL_TARGETS) $(LAST_TARGETS): force_rebuild -endif - -############################################################################ - diff --git a/scripts/clam/dotnet-retired/variables.def b/scripts/clam/dotnet-retired/variables.def deleted file mode 100644 index a645b02f..00000000 --- a/scripts/clam/dotnet-retired/variables.def +++ /dev/null @@ -1,514 +0,0 @@ -############################################################################### - -# CLAM System default variable definitions for C# compilation. - -############################################################################### - -# Pull in the base support for CLAM. -include variables.def - -############################################################################### - -#CLAM_BINARIES = $(CLAM_SCRIPTS)/../bin - -############################################################################### - -ifneq "$(BUILD_PARAMETER_FILE)" "" - # define our version of the build parameter file. this should be set - # beforehand so we override the default parameter file for clam. - export PARAMETER_FILE = $(BUILD_PARAMETER_FILE) -###no: $(FEISTY_MEOW_APEX)/build/identity.ini -endif -ifeq "$(PARAMETER_FILE)" "" - # last ditch attempt to get one that will work. - export PARAMETER_FILE = $(FEISTY_MEOW_APEX)/build.ini -endif - -############################################################################### - -# BASE_CPU is a flag that distinguishes the type of processor, if necessary. -export BASE_CPU -#BASE_CPU = m68k - # motorola 68000 series. -#BASE_CPU = m68340 - # motorola 68340. -#BASE_CPU = x86 - # intel x86. -#BASE_CPU = ppc860 - # power pc 860. - -# set the CPU default if we do not have one. -ifeq "$(BASE_CPU)" "" - BASE_CPU = x86 -endif - -# COMPILER is a flag that specifies the operating system or the compiler for -# use in conditional compilation (#ifdef ... #endif) of the compiler dependent -# interfaces or implementations. -export COMPILER -#COMPILER = VISUAL_CPP - -# choose a default compiler if none was specified. -ifeq "$(COMPILER)" "" - COMPILER = VISUAL_CPP -endif - -# COMPILER_VERSION specifies the version of a particular compiler, if this is -# needed to distinguish how the code is built. -export COMPILER_VERSION - -############################################################################### - -# "TYPE" is the kind of product being generated by this project. this is -# used to decide where to put the final products of compilation. this is a -# variable in the user's makefile. -# Valid Types: -# TYPE = library (outputs are static or dynamic libraries) -# TYPE = application (outputs are main-line executables) -# TYPE = test (outputs are test programs) -export TYPE - -############################################################################### - -# pseudo-boolean variable section. if these have any value at all, then they -# are treated as being true. note that these are flags that should generally -# be passed on the command line to a make. if they are intended to be used -# from inside a makefile, then they must appear before this file is included. - -# "REBUILD" causes a rebuild of all source files if it's true. -export REBUILD - -# "DEBUG" is used to specify a debugging build. the default is for this to -# be false, which causes a release build. -export DEBUG - -# "OPTIMIZE" creates optimized code. -export OPTIMIZE - -# "NO_COMPILE" just runs through the targets without compiling. it still -# promotes headers however. -export NO_COMPILE - -# "BUILD_LIST_FILE" is the set of files that need to be recompiled for -# visual c++. -export BUILD_LIST_FILE = $(CLAM_TMP)/clam_rebuild.$(PROJECT) - -# "BUILD_WHACK_FILE" is the set of object files that should be removed if -# a build failure occurs. -export BUILD_WHACK_FILE = $(CLAM_TMP)/clam_whack.$(PROJECT) - -# we're adding the build list to the flag files so we know it gets cleaned up. -FLAG_FILES += $(BUILD_LIST_FILE) $(BUILD_WHACK_FILE) - -############################################################################### - -# This section implements the HOOPLE directory scheme. If your scheme differs, -# then you'll want to modify these appropriately. - -# "THIRD_PARTY_DIR" is the root of our support libraries. -ifeq "$(OP_SYSTEM)" "UNIX" - export THIRD_PARTY_DIR -endif -ifeq "$(OP_SYSTEM)" "WIN32" - export THIRD_PARTY_DIR = $(FEISTY_MEOW_APEX)/3rdparty -endif - -# "OUTPUT_ROOT" is the root of all output directories for objects and other -# products being built. -export OUTPUT_ROOT = $(TARGETS_STORE)/obj - -# "PLATFORM_ADD_IN" is an option discriminator for the intended execution -# platform. it should end in an underscore if it is provided. -#PLATFORM_ADD_IN = linux_ -#PLATFORM_ADD_IN = w32_ -PLATFORM_ADD_IN = - -# "CPU_BUILD_DIR" distinguishes object directories by including the cpu -# name and the type of build. -ifneq "$(DEBUG)" "" - CPU_BUILD_DIR = $(BASE_CPU)_dbg -else - CPU_BUILD_DIR = $(BASE_CPU)_$(PLATFORM_ADD_IN)rel -endif - -# "BASE_OUTPUT_PATH" is the parent directory of objects for this type of -# cpu and this type of build. -export BASE_OUTPUT_PATH = $(OUTPUT_ROOT)/$(CPU_BUILD_DIR) - -# "OUTPUT_PATH" is the directory to generate all compiled products into. -export OUTPUT_PATH = $(BASE_OUTPUT_PATH)/$(PROJECT) - -# "OBJECT_DIR" is where object files will be stored during compilation for the -# target type being produced. -export OBJECT_DIR = $(OUTPUT_PATH) - -# These specify where files are to be created or located for our local build. -export EXECUTABLE_DIR = $(TARGETS_STORE)/exe -export DYNAMIC_LIBRARY_DIR = $(TARGETS_STORE)/dll -export STATIC_LIBRARY_DIR = $(TARGETS_STORE)/lib -export TESTS_DIR = $(TARGETS_STORE)/tests - -# "HEADER_SEARCH_PATH" is where the class interface files are to be found. -#HEADER_SEARCH_PATH = - -# "HOOPLE_HEADERS" are locations where the HOOPLE headers can be found. -HOOPLE_HEADERS := $(shell $(FIND) $(FEISTY_MEOW_APEX)/source/lib_src $(FEISTY_MEOW_APEX)/libraries -mindepth 1 -maxdepth 1 -type d) - -# "LOCAL_HEADERS" are overrides that go first in the header search path. -#LOCAL_HEADERS = - -# "CODEBASE_HEADERS" is a list that can be changed for a particular codebase. -# it is guaranteed that clam will not interfere with this list, whereas -# the LOCAL_HEADERS can be modified by clam. -#CODEBASE_HEADERS = - -# "LOCAL_LIBRARIES" are overrides that go first in the library search path. -#LOCAL_LIBRARIES = - -# "LIBRARY_SEARCH_PATH" is where the library files are to be found. -#LIBRARY_SEARCH_PATH = - -# "HOOPLE_LIBRARIES" is where our local libraries are located. -HOOPLE_LIBRARIES = - -# "EXTRA_COPIES" is a list of files that are copied to a project's output -# directory. -export EXTRA_COPIES - -# "EXTRA_VERSIONS" is a list of version files to synchronize with the main -# library version for this build. if a file called "version.ini" exists in -# the project directory, then it will automatically be upgraded, so the -# extra version files are mainly useful when you have a project with multiple -# programs in it and you want them to have independent version files (as you -# should perhaps want). -export EXTRA_VERSIONS - -# "OMIT_VERSIONS" is another exclusion flag. this one turns off the creation -# of version resource files and eliminates any references that would include -# such files. this is needed when rebuilding version_stamper. -#OMIT_VERSIONS = t - -# Add the obligatory junk to be cleaned up. Individual compiler sections -# should customize this by adding their object output directories. -CLEANUPS += $(ACTUAL_TARGETS) $(OUTPUT_PATH) -#hmmm: import libs for dynamic libraries on ms-win32 don't currently get -# cleaned up nicely. - -############################################################################### - -# "SEARCH_DIRS" is a list of directories that should be searched for both C++ -# header files and for C++ code libraries. The items placed in SEARCH_DIRS -# are fed into both the LIBRARY_SEARCH_PATH and the HEADER_SEARCH_PATH. -#SEARCH_DIRS = - -# "DEFINITIONS" is a list of compiler flags that define the value of c macros. -# These usually have the format of -D, but in this variable, only the -# itself should be listed because the compiler option -D is added -# automatically. -DEFINITIONS = CLAM_BUILT - -ifneq "$(BOOT_STRAPPING)" "" - # the software is being built from the ground up, including the binaries - # we use for building (like value_tagger and others). - DEFINITIONS += BOOT_STRAPPING -endif - -# "UNDEFINITIONS" is a list of macros to undefine. -#UNDEFINITIONS = - -#hmmm: these kinds of defines (with a value) do not work for csharp. -# GLOBAL_PRODUCT_NAME is an important variable for tagging the entire code base -# with some branding. It is provided as a macro definition to all source -# files. The initial value for the macro should come from the build init -# file, but if it doesn't, we pick a default. -##ifeq "$(product_name)" "" -## DEFINITIONS += GLOBAL_PRODUCT_NAME=\\\"HOOPLE\\\" -##else -## DEFINITIONS += GLOBAL_PRODUCT_NAME=\\\"$(product_name)\\\" -##endif - -# *_PRODUCT_VERSION records parts of our version numbers for the code to see. -###DEFINITIONS += MAJOR_PRODUCT_VERSION=$(major) MINOR_PRODUCT_VERSION=$(minor) - -# "DEBUG_FLAGS" these flags are used for generating specialized versions of -# object files, such as ones that include debugging code or that add code for -# profiling. -# Possible values are -g for adding GDB debugging code and -pg for adding -# gprof profiling code. -#DEBUG_FLAGS = -g -#DEBUG_FLAGS = -pg -#DEBUG_FLAGS = - -# "COMPILER_FLAGS" are the flags for the pre-processor and compiler. -#COMPILER_FLAGS = - -# "STRICT_WARNINGS" turns on all warnings and forces them to be considered -# as errors when encountered. -#STRICT_WARNINGS = - -# "LIBRARIAN_FLAGS" are flags that need to be passed to the library tool -# that creates static code libraries. -#LIBRARIAN_FLAGS = - -# "SOURCE" is the list of files that are turned into objects. -#SOURCE = - -# "LIBS_USED" are system or compiler code libraries that the targets to be -# created depend upon. -#LIBS_USED = - -# "LOCAL_LIBS_USED" is very similar to the LIBS_USED, but these libraries -# actually cause executables and object files to be recompiled when the -# libraries specified have changed. To accomplish this, these libraries MUST -# be located in the STATIC_LIBRARY_DIR rather than at some arbitrary place -# on the LIBRARY_SEARCH_PATH. -#LOCAL_LIBS_USED = - -# Load flags tell the linker and loader how to deal with the files and where -# to locate library components. The prefix goes before object files are -# listed, and the suffix after. The prefix should have things like the -# directories to be searched for code libraries (although they should be added -# to LIBRARY_SEARCH_PATH) and the loading mode for functions (static/dynamic). -# In the suffix, actual library loading statements (like -lmath) can be -# included (although they should be listed in a different form in LIBS_USED). -# Remember that the unix loader looks for functions in libraries in a bizarre -# way: ld searches for a function only when it has already been asked for it. -# This means that it doesn't remember what functions it has already been -# provided with in the libraries and object files, and it will fail if those -# functions are only asked for after they have already been encountered. -#LOAD_FLAG_PREFIX = -#LOAD_FLAG_SUFFIX = - -# The prefix used on library names, mostly for unix. -LIB_PREFIX = -# The standard suffix for static or import libraries on this operating system. -LIB_ENDING = - -# Flag for specifying the library name to create. -#CREATE_LIBRARY_FLAG = - -# Flag for specifying a library to include in linking. -LIBRARY_NAME_FLAG = -l - -# Flag for specifying a directory to add to the search path for libs. -#LIBRARY_PATH_FLAG = -L - -# Flag for specifying the name of an output from the linker. -#LINKER_OUTPUT_FLAG = - -# Flag for separating linker options from compilation options for a combined -# compiler / linker. -#LINKER_OPTION_SEPARATOR = - -# Flag that passes special options when building executable programs. It is -# passed just before the LOAD_FLAG_PREFIX. -#EXE_FLAGS = - -# The name of the compiler tool. -#CC = - -# The name of the library creator tool. -#LIBRARY_TOOL = - -# the root name of the version file. This is currently irrelevant on -# non-win32 platforms. -VERSION_RC_ROOT = $(shell $(SHELL) $(CLAM_SCRIPTS)/cpp/rc_name.sh) - # we import the rc_name from our close ally, the c++ compiler definitions. - -############################################################################### - -# Compiler Dependent Flags -# -# "COMPILER_ROOT_DIR" is the top-level for the C++ compiler location. -# "COMPILER_HEADER_DIR" is where the compiler's headers are. -export COMPILER_HEADER_DIR -# "COMPILER_LIBRARY_DIR" is where archived libraries are. -# "CC" is the name of the C++ compiler to be used. - -ifeq "$(COMPILER)" "VISUAL_CPP" - # microsoft visual studio 7. - - LIB_ENDING = .dll - PLATFORM_ADD_IN = w32_ - - # these define special characteristics for a program being built. - # BASE is almost always defined and pulls in fundamental w32 support. - # RPC supplies the remote procedure call libraries. - # OLE pulls in object linking and embedding support. - # SECURITY links with the w32 security APIs. - # CLR sets options that are appropriate for managed code. - VCPP_USE_BASE=true - VCPP_USE_RPC= - VCPP_USE_OLE= - VCPP_USE_SECURITY= - VCPP_USE_CLR= - VCPP_VISTA_ICON= - - # the framework dir points at the .net framework to be used for compilation. - ifeq "$(FRAMEWORK_VERSION)" "" - - # older .net 1.1. -# SHORT_FRAMEWORK_VERSION = 1.1 -# FRAMEWORK_VERSION = $(SHORT_FRAMEWORK_VERSION).4322 - - # old .net 2.0. -# SHORT_FRAMEWORK_VERSION = 2.0 -# FRAMEWORK_VERSION = $(SHORT_FRAMEWORK_VERSION).50727 - - # current .net 3.5. - SHORT_FRAMEWORK_VERSION = 3.5 - FRAMEWORK_VERSION = $(SHORT_FRAMEWORK_VERSION) - - endif - export FRAMEWORK_DIR - ifeq "$(FRAMEWORK_DIR)" "" - FRAMEWORK_DIR = $(subst \,/,$(WINDIR))/Microsoft.NET/Framework/v$(FRAMEWORK_VERSION) - endif - - # pick a default compiler version for what we tend to use the most at the - # current time. - ifeq "$(COMPILER_VERSION)" "" - COMPILER_VERSION = 7 - endif -## DEFINITIONS += COMPILER_VERSION=$(COMPILER_VERSION) - # add a macro so programs can check what version is appropriate. - - # C# needs an entry point for exes. a different one can be specified also. - ENTRY_POINT = main - - # C# treats resources differently than simple code files. the list in this - # variable will be embedded in the target. - #RESX = - - # TLBEXPORT is a tool to create TLB files from DLL files. - TLBEXPORT = $(COMPILER_ROOT_DIR)/../SDK/v$(SHORT_FRAMEWORK_VERSION)/bin/tlbexp$(EXE_END) - - # calculate the visual studio root directory. - export VIS_STU_ROOT := $(shell $(SHELL) $(CLAM_SCRIPTS)/cpp/ms_root_dir.sh $(CLAM_BINARIES) ) - ifneq "$(VIS_STU_ROOT)" "" - COMPILER_ROOT_DIR = $(VIS_STU_ROOT)/vc# - endif - ifeq "$(COMPILER_ROOT_DIR)" "" - HOSEUP = $(shell echo The compiler directory is not set. Please define the environment ) - HOSEUP = $(shell echo variable VSxCOMNTOOLS to point at the folder where visual C++ is installed. ) - HOSEUP = - endif - - export COMPILER_VERSION = $(shell $(SHELL) $(CLAM_SCRIPTS)/cpp/get_version.sh $(COMPILER) $(COMPILER_ROOT_DIR) ) - - # set a variable for the resource compiler for old-style resources. - STANDARD_RC = $(VIS_STU_ROOT)/vc/bin/rc - - # set up a directory for debugging files to be stored. these are not - # moved with the postconditions--they are generated in place. - export PDB_DIR=$(TARGETS_STORE)/pdb - - # set these way up here so we can override them later. - CC = bash $(CLAM_SCRIPTS)/csharp/csharper.sh -##$(FRAMEWORK_DIR)/csc - -# LINK_TOOL = $(COMPILER_ROOT_DIR)/bin/link - - # vary the locations for compiler files based on the version. - COMPILER_HEADER_DIR = $(VIS_STU_ROOT)/vc/include $(VIS_STU_ROOT)/vc/atlmfc/include $(VIS_STU_ROOT)/vc/platformsdk/include - COMPILER_LIBRARY_DIR = -###$(COMPILER_ROOT_DIR)/lib $(COMPILER_ROOT_DIR)/atlmfc/lib $(COMPILER_ROOT_DIR)/platformsdk/lib - RC = $(COMPILER_ROOT_DIR)/../SDK/v2.0/bin/resgen$(EXE_END) - - ifeq "$(COMPILER_HEADER_DIR)" "" - HOSEUP = $(shell echo The compiler version is not set. Please define COMPILER_VERSION.) - endif - - DEFINITIONS += _Windows _WINDOWS WIN32 __WIN32__ __FLAT__ VC_EXTRALEAN WIN32_LEAN_AND_MEAN ATL_NO_LEAN_AND_MEAN _WIN32_WINNT=0x403 - DEF_FILE = - LIBRARY_TOOL = $(COMPILER_ROOT_DIR)/bin/lib - LOAD_FLAG_PREFIX = -nologo -#-subsystem:windows -machine:IX86 - LOAD_FLAG_SUFFIX = - - MIDL = midl -Oicf $(MIDL_DEFS) $(HEADER_SEARCH_PATH:%=-I% ) $(DEFINITIONS:%=-I% ) - MIDL_DEFS = -no_robust - - # set the flags used by visual c++. - CREATE_LIBRARY_FLAG = -out: - LIBRARY_NAME_FLAG = -reference: - LIBRARY_PATH_FLAG = -lib: - LINKER_OPTION_SEPARATOR = -link - LINKER_OUTPUT_FLAG = -out: - - # Add the extra files created by visual c++. -#is this needed now that we whack whole output path? CLEANUPS += $(OUTPUT_PATH)/*.*db - - # put the common flags into the compiler flags. - COMPILER_FLAGS += -nologo -#-Fd$(PDB_DIR)/$(PROJECT)_bookkeeping.pdb -GR -GX -W3 -Zi -EHsc -GS -Gd - - ifneq "$(DEBUG)" "" - # disable function inlining and optimizations for debug. -# COMPILER_FLAGS += -Ob0 -Od - else - # enable function inlining for release only. -# COMPILER_FLAGS += -Ob1 - - ifneq "$(OPTIMIZE)" "" - # add in fast code optimization. -#testing... -# COMPILER_FLAGS += -O2 -#trying O2 again although it seems to combust too easily. - else - # no optimizations. - endif - - endif - - # check if profiling is to be enabled. - PROFILER_FLAG = - ifneq "$(PROFILE)" "" - PROFILER_FLAG = -profile - endif - - # add the common linker flags. the debugging flag is added because we - # want to be able to debug into release code, but since the pdb files - # are separate, we're not exposing ourselves when we don't include them. - LOAD_FLAG_PREFIX += $(PROFILER_FLAG) -debug -#-warn:3 - - # "USE_MFC" dictates whether mfc should be allowed in the application. - # the default is not to use MFC extension style dlls. this can be turned - # on in the individual makefiles that require MFC. - #USE_MFC = - - # the library creator gets a couple of flags. - LIBRARIAN_FLAGS += -nologo -machine:IX86 - - # now, vary the flag configuration based on the flags that have been set. - - ifneq "$(CONSOLE_MODE)" "" - # console type of applications are built using the static flag so that - # they are more redistributable. - DEFINITIONS += _CONSOLE -### LOAD_FLAG_SUFFIX += -subsystem:console - STATIC = true - endif - - # dynamically linked library or application flags. - ifneq "$(DEBUG)" "" - # debug. - DEFINITIONS += _DEBUG -# COMPILER_FLAGS += -MDd - else - # release. - DEFINITIONS += NDEBUG -# COMPILER_FLAGS += -MD - endif - - ifneq "$(STRICT_WARNINGS)" "" -# COMPILER_FLAGS += -W3 -WX - # we have not turned on W4 because it is not really warnings for the - # microsoft compiler. instead, it is a bunch of blather about what the - # compiler intends to do rather than problems in the code. - endif - -endif - - diff --git a/scripts/customize/fred/fred_variables.sh b/scripts/customize/fred/fred_variables.sh index 660bfa64..edc0e45c 100644 --- a/scripts/customize/fred/fred_variables.sh +++ b/scripts/customize/fred/fred_variables.sh @@ -25,7 +25,7 @@ if [ -z "$USER_CUSTOMIZATIONS_LOADED" ]; then SOURCECODE_HIERARCHY_LIST="codebarn extra_brain interbrane" # point to our local certificate for ssh usage. - export SVN_SSH="ssh -i $HOME/.ssh/id_dsa_sourceforge" + export SVN_SSH="ssh -i $HOME/.ssh/others/id_dsa_sourceforge" # Error and success noises for CLAM. export CLAM_ERROR_SOUND='/z/walrus/media/sounds/effects/bwaaang.wav /z/walrus/media/sounds/cartoons/doh4.wav' diff --git a/scripts/z_outgoing/dotnet-retired/csharper.sh b/scripts/z_outgoing/dotnet-retired/csharper.sh deleted file mode 100644 index ec476037..00000000 --- a/scripts/z_outgoing/dotnet-retired/csharper.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -declare -a flipped=() -for i in $*; do - flip=$(echo $i | sed -e 's/\/\([a-zA-Z]\)\//\1:\//' | tr '/' '\\') - flipped+=($flip) -done -${FRAMEWORK_DIR}/csc ${flipped[*]} - diff --git a/scripts/z_outgoing/dotnet-retired/postconditions.sh b/scripts/z_outgoing/dotnet-retired/postconditions.sh deleted file mode 100644 index 9d145243..00000000 --- a/scripts/z_outgoing/dotnet-retired/postconditions.sh +++ /dev/null @@ -1,107 +0,0 @@ -#!/bin/bash -# copies the final products of the current project into the repository. - -# check whether a failure should prevent promotion from occurring. -if [ -f $FAILURE_FILE ]; then - echo Postconditions will not promote due to a failure: - cat $FAILURE_FILE - . $CLAM_SCRIPTS/exit_make.sh -fi - -# make sure that we actually did something during the make. -if [ ! -f "$DIRTY_FILE" -a ! -f "$SUBMAKE_FLAG" ]; then - # nothing was built, seemingly, so we do no promotion. - exit -fi - -# toss the flag files so we don't see them again. -rm -f "$DIRTY_FILE" "$SUBMAKE_FLAG" - -# clean up generated resource files after the build. -for i in *.resources; do rm -f "$i"; done - -# these variables define the locations for final products. all of them -# descend from the root of the repository. -ROOT=$TARGETS_STORE -LIB_DIR=$ROOT/lib -DLL_DIR=$ROOT/dll -EXE_DIR=$ROOT/exe -TEST_ROOT=$ROOT/tests -TEST_DIR=$TEST_ROOT/$PROJECT - -# causes the shell to quit. -DIE=". $CLAM_SCRIPTS/exit_make.sh" - -if [ "$TYPE" = "library" ]; then - - # make sure the required directories exist. - if [ ! -d $ROOT ]; then mkdir -p $ROOT; fi - if [ ! -d $LIB_DIR ]; then mkdir $LIB_DIR; fi - if [ ! -d $DLL_DIR ]; then mkdir $DLL_DIR; fi - - if [ -z "$NO_COMPILE" ]; then - # we ensure that none of the normal products are copied for a non-compiling - # style of project. - - # copy the import libraries for any DLLs. - if [ ! -z "`$FIND "$DYNAMIC_LIBRARY_DIR" -iname "*.lib"`" ]; then - echo Moving import libraries to $LIB_DIR. - mv "$DYNAMIC_LIBRARY_DIR"/*.lib $LIB_DIR - fi - - fi - -elif [ "$TYPE" = "application" ]; then - - # sets up the directory for executable programs and copies any found in the - # this project's final directory. - - # first make sure the executable directory is around. - if [ ! -d $EXE_DIR ]; then mkdir $EXE_DIR; fi - - if [ -z "$NO_COMPILE" ]; then - # we ensure that none of the normal products are copied for a non-compiling - # style of project. - - # copy anything extra over. - if [ ! -z "$EXTRA_COPIES" ]; then - echo Copying extra files to $EXE_DIR. - echo [$EXTRA_COPIES] - cp -f $EXTRA_COPIES $EXE_DIR || $DIE - fi - - fi - -elif [ "$TYPE" = "test" ]; then - - # sets up a directory for test programs based on the project name and copies - # the generated programs into there. - - # first make sure the test program root directory is around. - if [ ! -d $TEST_ROOT ]; then mkdir $TEST_ROOT; fi - - # create the target directory if it doesn't exist. - if [ ! -d $TEST_DIR ]; then mkdir $TEST_DIR; fi - - if [ -z "$NO_COMPILE" ]; then - # we ensure that none of the normal products are copied for a non-compiling - # style of project. - - # make the files writable. this is required for some tests' data files, - # which come in from the build and could be read-only. - chmod 777 $TEST_DIR/* $TEST_DIR/*/* $TEST_DIR/*/*/* >/dev/null 2>&1 - - # copy anything extra over. - if [ ! -z "$EXTRA_COPIES" ]; then - echo Copying extra files to $TEST_DIR. - echo [$EXTRA_COPIES] - cp -f $EXTRA_COPIES $TEST_DIR || $DIE - fi - - fi - -else - echo "Unknown type for project [$TYPE]; cancelling postconditions!" - . $CLAM_SCRIPTS/exit_make.sh -fi - diff --git a/scripts/z_outgoing/dotnet-retired/preconditions.sh b/scripts/z_outgoing/dotnet-retired/preconditions.sh deleted file mode 100644 index cdf66d75..00000000 --- a/scripts/z_outgoing/dotnet-retired/preconditions.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash -# prepares the project for compilation by creating the appropriate directories. - -# make sure the top-level repository exists. -if [ ! -d $FEISTY_MEOW_APEX ]; then mkdir -p $FEISTY_MEOW_APEX; fi -# make sure our temp directory is there. -if [ ! -d $CLAM_TMP ]; then mkdir -p $CLAM_TMP; fi -# make sure the generated files have a home. -if [ ! -d $TARGETS_STORE ]; then mkdir -p $TARGETS_STORE; fi -# create the generated files storage area. -if [ ! -d $OUTPUT_ROOT ]; then mkdir -p $OUTPUT_ROOT; fi -# create the top level object directory if it doesn't exist. -if [ ! -d $BASE_OUTPUT_PATH ]; then mkdir -p $BASE_OUTPUT_PATH; fi -# create the project level object directory if it is non-existent. -if [ ! -d $OUTPUT_PATH ]; then mkdir -p $OUTPUT_PATH; fi -# create a directory to hold any debugging files, if necessary. -if [ ! -d $PDB_DIR ]; then mkdir -p $PDB_DIR; fi -# -if [ ! -d $TESTS_DIR ]; then mkdir -p $TESTS_DIR; fi -# -if [ ! -d $EXECUTABLE_DIR ]; then mkdir -p $EXECUTABLE_DIR; fi -# -if [ ! -d $DYNAMIC_LIBRARY_DIR ]; then mkdir -p $DYNAMIC_LIBRARY_DIR; fi -# -if [ ! -d $STATIC_LIBRARY_DIR ]; then mkdir -p $STATIC_LIBRARY_DIR; fi - -# set versions on any extras that were specified in the makefile. -if [ ! -z "$EXTRA_VERSIONS" ]; then - for i in $EXTRA_VERSIONS; do $CLAM_BINARIES/version_stamper$EXE_END $i $PARAMETER_FILE; done -fi - -# create all the directories that objects will go into. -###for i in $OUTPUT_DIRECTORY_LIST; do -### if [ ! -d "$OUTPUT_PATH/$i" ]; then mkdir "$OUTPUT_PATH/$i"; fi -###done - -# for firmware compilations set the compiler to the correct processor platform -if [ "$COMPILER" = "DIAB" ]; then - $COMPILER_CONTROL $COMPILER_CONTROL_FLAGS -fi - diff --git a/scripts/z_outgoing/dotnet-retired/readme.txt b/scripts/z_outgoing/dotnet-retired/readme.txt deleted file mode 100644 index abe066a5..00000000 --- a/scripts/z_outgoing/dotnet-retired/readme.txt +++ /dev/null @@ -1,9 +0,0 @@ - - -this is out of date! - -it used to compile c# assets on windows pretty well. -now it probably does nothing. - -we intend to refurbish it for use with mono. - diff --git a/scripts/z_outgoing/dotnet-retired/rules.def b/scripts/z_outgoing/dotnet-retired/rules.def deleted file mode 100644 index 9ab0aaaf..00000000 --- a/scripts/z_outgoing/dotnet-retired/rules.def +++ /dev/null @@ -1,262 +0,0 @@ -############################################################################### - -# CLAM System default rules and targets for C++ compilation. - -# This file composite macros and rules for creating compilation objects -# (such as library archives, object files, executable programs, and others). - -# This file should be included in the user's Makefile after the variables -# have been initialized appropriately for the particular project being -# compiled. The user's own targets should be placed after the include -# directive that specifies this file. - -############################################################################### - -# This section manipulates variable values to prepare them for their use -# in the standard CLAM support. - -# Modify the output directory for executable files if we're building a -# test project. -ifeq "$(TYPE)" "test" - EXECUTABLE_DIR = $(TARGETS_STORE)/tests/$(PROJECT) - ifneq "$(CONSOLE_MODE)" "" - COMPILER_FLAGS += -target:exe - else - COMPILER_FLAGS += -target:winexe - endif -endif -ifeq "$(TYPE)" "application" - ifneq "$(CONSOLE_MODE)" "" - COMPILER_FLAGS += -target:exe - else - COMPILER_FLAGS += -target:winexe - endif -endif -ifeq "$(TYPE)" "library" - COMPILER_FLAGS += -target:library -endif - -# prep the actual source variable so that certain file names are translated. -ACTUAL_RESX = $(RESX:%.resx=%.resources) - -ifeq "$(OP_SYSTEM)" "WIN32" - ifneq "$(OMIT_VERSIONS)" "" - # remove version rc files if we're not dealing with versions. - ACTUAL_RESOURCE = $(RESOURCE:%.rc=) - else - ACTUAL_RESOURCE = $(RESOURCE:%.rc=%.res) - endif -else - # replace this when supporting resource files on unix. - ACTUAL_RESOURCE = $(RESOURCE:%.rc=) -endif - -# patch the sources so that subdirs work. -ACTUAL_SOURCE = $(SOURCE:%.cs=$(CURRENT_DIR)/%.cs) - -# visual studio settings. -ifeq "$(COMPILER)" "VISUAL_CPP" - # processes the def file for linkage, if one has been specified. - ifneq "$(DEF_FILE)" "" - LOAD_FLAG_PREFIX += -def:$(DEF_FILE) - endif - - # these are loaded after any special debugging libs. - ifneq "$(VCPP_USE_BASE)" "" - # the first set will be included in almost any old program. we include - # winmm for multimedia in the base support since we make heavy use of the - # more accurate uptime function. -# LOAD_FLAG_PREFIX += advapi32.lib kernel32.lib version.lib winmm.lib - endif -#is advapi32 really part of the base required stuff? will it work on -#win98? how about win95? - - ifneq "$(VCPP_USE_GUI)" "" - LOAD_FLAG_PREFIX += comdlg32.lib gdi32.lib user32.lib winspool.lib - endif - - ifneq "$(VCPP_USE_OLE)" "" - LOAD_FLAG_PREFIX += ole32.lib oleaut32.lib uuid.lib - VCPP_USE_RPC = t - endif - ifneq "$(VCPP_USE_RPC)" "" - LOAD_FLAG_PREFIX += rpcndr.lib rpcns4.lib rpcrt4.lib - VCPP_USE_SOCK = t - endif - ifneq "$(VCPP_USE_SOCK)" "" - LOAD_FLAG_PREFIX += netapi32.lib ws2_32.lib - endif -endif - -# Updates the search path for the compiler and local libraries. -BASE_HEADER_PATH = $(CODEBASE_HEADERS) $(LOCAL_HEADERS) $(HOOPLE_HEADERS) $(SEARCH_DIRS) -HEADER_SEARCH_PATH += $(BASE_HEADER_PATH) $(COMPILER_HEADER_DIR) - -LIBRARY_SEARCH_PATH += $(LOCAL_LIBRARIES) $(HOOPLE_LIBRARIES) \ - $(STATIC_LIBRARY_DIR) $(COMPILER_LIBRARY_DIR) $(SEARCH_DIRS) - -# Adds some directories that must be searched onto the search path for -# header files, such as the compiler's own special header file directory. -COMPILER_FLAGS += $(DEFINITIONS:%=-D:%) $(UNDEFINITIONS:%=-U%) -#$(HEADER_SEARCH_PATH:%=-I%) - -# The load flags are updated by looking for code libraries in the directories -# to search and by adding all of the code libraries that are used. -LOAD_FLAG_PREFIX += $(LIBRARY_SEARCH_PATH:%=$(LIBRARY_PATH_FLAG)%) -LOAD_FLAG_PREFIX += $(LIBS_USED:%=$(LIBRARY_NAME_FLAG)%) - -# prepare for mfc style DLLs. currently we plan on all dlls we create being -# based on MFC. this is an unfortunate requirement for using the mfc debug -# support for allocations; if regular new and DEBUG_NEW get mixed together, -# crashes used to result. supposedly these are gone now at least. -ifneq "$(USE_MFC)" "" - # set the flag that says we are doing mfc extension dlls. - DEFINITIONS += _AFXDLL - - # add in the mfc directories. - COMPILER_HEADER_DIR += $(COMPILER_ROOT_DIR)/mfc/include - COMPILER_LIBRARY_DIR += $(COMPILER_ROOT_DIR)/mfc/lib -endif - -ifeq "$(OMIT_VERSIONS)" "" - ifneq "$(VERSION_RC_ROOT)" "" - VERSION_TARGET = $(VERSION_RC_ROOT)_version.rc - endif -endif - -# Make sure that the directory for objects exists. -ACTUAL_FIRST_TARGETS = check_requirements $(VERSION_TARGET) $(FIRST_TARGETS) pre_compilation - -# Adds the primary targets to the list of products to create. -ACTUAL_TARGETS1 = $(TARGETS:%.exe=$(EXECUTABLE_DIR)/%.exe) -ACTUAL_TARGETS2 = $(ACTUAL_TARGETS1:%.dll=$(DYNAMIC_LIBRARY_DIR)/%.dynlibrary) -ACTUAL_TARGETS3 = $(ACTUAL_TARGETS2:%.so=$(DYNAMIC_LIBRARY_DIR)/%.so) -ACTUAL_TARGETS4 = $(ACTUAL_TARGETS3:%.lib=$(STATIC_LIBRARY_DIR)/%.library) -ACTUAL_TARGETS = $(ACTUAL_TARGETS4:%.elf=$(EXECUTABLE_DIR)/%.elf) - -# Adds the last few targets for CLAM to do. -ACTUAL_LAST_TARGETS = post_compilation $(LAST_TARGETS) - -############################################################################ - -# This section defines the rules used to generate various objects from their -# source files. - -############################################################################ - -# resource compiler for c#. - -%.resources: %.resx - @echo Creating resource file [$@]. - $(RC) $< $@ -# $(CATCHER)$(RC) $< $@ - -############################################################################ - -# resource compiler for standard resource files. - -ifeq "$(OP_SYSTEM)" "WIN32" -%.res: %.rc - @echo Creating resource file [$@]. -ifeq "$(NO_COMPILE)" "" - $(CATCHER)$(STANDARD_RC) -r $(DEFINITIONS:%=-D%) $(HEADER_SEARCH_PATH:%=-i%) -fo $@ $< -endif -endif - -############################################################################ - -# creates dynamic libraries. - -# we whack any existing LIB file, since we want to use changes in that file -# as a clue for when we should rescan the dependencies. we'd be fine if -# visual c++ didn't keep an existing LIB if it doesn't change (even when the -# DLL does). - -$(DYNAMIC_LIBRARY_DIR)/%.dynlibrary: $(LOCAL_LIBS_USED:%=$(DYNAMIC_LIBRARY_DIR)/$(LIB_PREFIX)%$(LIB_ENDING)) $(ACTUAL_RESX) $(ACTUAL_SOURCE) $(ACTUAL_RESOURCE) - $(HIDER)echo Creating dynamic library [$@]. - @echo $@ >$(DIRTY_FILE) - $(HIDER)rm -f $(@:%.dll=%.lib) - $(CATCHER)$(CC) $(COMPILER_FLAGS) $(EXE_FLAGS) $(LOAD_FLAG_PREFIX) $(LOCAL_LIBS_USED:%=$(LIBRARY_NAME_FLAG)$(DYNAMIC_LIBRARY_DIR)/$(LIB_PREFIX)%$(LIB_ENDING)) $(LOAD_FLAG_SUFFIX) $(LINKER_OUTPUT_FLAG)$@ $(ACTUAL_SOURCE) $(ACTUAL_RESX:%=-res:%) $(ACTUAL_RESOURCE:%=-win32res:%) -ifneq "$(VCPP_VISTA_ICON)" "" - $(HIDER)ReplaceVistaIcon "$@" "$(VCPP_VISTA_ICON)" -endif - $(HIDER)mv $@ $(DYNAMIC_LIBRARY_DIR)/$(LIB_PREFIX)$*$(LIB_ENDING) -ifneq "$(CREATE_TLB)" "" - $(CATCHER)$(TLBEXPORT) $(DYNAMIC_LIBRARY_DIR)/$(LIB_PREFIX)$*$(LIB_ENDING) -out:$(DYNAMIC_LIBRARY_DIR)/$(LIB_PREFIX)$*.tlb -endif - $(HIDER)echo nil >$@ - -#$(LINKER_OUTPUT_FLAG)$@ -dll $(LOAD_FLAG_PREFIX) $(ACTUAL_OBJECTS:%=$(OBJECT_DIR)/%) $(LOCAL_LIBS_USED:%=$(LIBRARY_NAME_FLAG)$(LIB_PREFIX)%$(LIB_ENDING)) $(LOAD_FLAG_SUFFIX) - -############################################################################ - -# creates "exe" executables using all of the appropriate objects. -$(EXECUTABLE_DIR)/%.exe: $(LOCAL_LIBS_USED:%=$(DYNAMIC_LIBRARY_DIR)/$(LIB_PREFIX)%$(LIB_ENDING)) $(ACTUAL_RESX) $(ACTUAL_SOURCE) $(ACTUAL_RESOURCE) - $(HIDER)echo Building program [$@]. - @echo $@ >$(DIRTY_FILE) - $(CATCHER)$(CC) $(COMPILER_FLAGS) $(EXE_FLAGS) $(LOAD_FLAG_PREFIX) $(LOCAL_LIBS_USED:%=$(LIBRARY_NAME_FLAG)$(DYNAMIC_LIBRARY_DIR)/$(LIB_PREFIX)%$(LIB_ENDING)) $(LOAD_FLAG_SUFFIX) $(LINKER_OUTPUT_FLAG)$@ $(ACTUAL_SOURCE) $(ACTUAL_RESX:%=-res:%) $(ACTUAL_RESOURCE:%=-win32res:%) -ifneq "$(VCPP_VISTA_ICON)" "" - $(HIDER)ReplaceVistaIcon "$@" "$(VCPP_VISTA_ICON)" -endif - -############################################################################ - -# handles creating version resource files if this project has a version.ini. - -ifeq "$(OMIT_VERSIONS)" "" - ifneq "$(VERSION_RC_ROOT)" "" -# only redo the version resource if it or version.ini is out of date. -%_version.rc: version.ini $(PARAMETER_FILE) - $(CATCHER)$(CLAM_BINARIES)/version_stamper$(EXE_END) . $(PARAMETER_FILE) - endif -endif - -############################################################################ - -# Now the active part of the make process... - -# Adds the main CLAM system in to get some work done. This should be placed -# after the module's rules are defined and before the module's targets are -# defined. -include rules.def - -# preserves intermediate files from being deleted. -##.PRECIOUS: %.resources - -# zaps things when they could not be created correctly. -.DELETE_ON_ERROR: - -############################################################################ - -# examines the required variables and complains if they're missing. -check_requirements: - $(HIDESH) -c 'if [ -z "$(PROJECT)" ]; then echo the PROJECT variable is not defined!; . $(CLAM_SCRIPTS)/exit_make.sh; fi' - $(HIDESH) -c 'if [ -z "$(TYPE)" ]; then echo the TYPE variable is not defined!; . $(CLAM_SCRIPTS)/exit_make.sh; fi' - -############################################################################ - -# calls the script for preparing output directories and such. -pre_compilation: - $(HIDESH)$(CLAM_SCRIPTS)/csharp/preconditions.sh - -############################################################################ - -# calls the script for copying the final products to the library directory. -# we don't bother reporting errors from touch since there will sometimes -# not be any objects in the final directory. -post_compilation: - $(HIDESH)$(CLAM_SCRIPTS)/csharp/postconditions.sh - -############################################################################ - -# if REBUILD is defined, then we cause all objects to be recompiled. -.PHONY: force_rebuild -force_rebuild: - -ifneq "$(REBUILD)" "" - # the target below needs the blank rule that it has for this to work. - $(FIRST_TARGETS) $(ACTUAL_OBJECTS:%=$(OBJECT_DIR)/%) $(ACTUAL_TARGETS) $(LAST_TARGETS): force_rebuild -endif - -############################################################################ - diff --git a/scripts/z_outgoing/dotnet-retired/variables.def b/scripts/z_outgoing/dotnet-retired/variables.def deleted file mode 100644 index a645b02f..00000000 --- a/scripts/z_outgoing/dotnet-retired/variables.def +++ /dev/null @@ -1,514 +0,0 @@ -############################################################################### - -# CLAM System default variable definitions for C# compilation. - -############################################################################### - -# Pull in the base support for CLAM. -include variables.def - -############################################################################### - -#CLAM_BINARIES = $(CLAM_SCRIPTS)/../bin - -############################################################################### - -ifneq "$(BUILD_PARAMETER_FILE)" "" - # define our version of the build parameter file. this should be set - # beforehand so we override the default parameter file for clam. - export PARAMETER_FILE = $(BUILD_PARAMETER_FILE) -###no: $(FEISTY_MEOW_APEX)/build/identity.ini -endif -ifeq "$(PARAMETER_FILE)" "" - # last ditch attempt to get one that will work. - export PARAMETER_FILE = $(FEISTY_MEOW_APEX)/build.ini -endif - -############################################################################### - -# BASE_CPU is a flag that distinguishes the type of processor, if necessary. -export BASE_CPU -#BASE_CPU = m68k - # motorola 68000 series. -#BASE_CPU = m68340 - # motorola 68340. -#BASE_CPU = x86 - # intel x86. -#BASE_CPU = ppc860 - # power pc 860. - -# set the CPU default if we do not have one. -ifeq "$(BASE_CPU)" "" - BASE_CPU = x86 -endif - -# COMPILER is a flag that specifies the operating system or the compiler for -# use in conditional compilation (#ifdef ... #endif) of the compiler dependent -# interfaces or implementations. -export COMPILER -#COMPILER = VISUAL_CPP - -# choose a default compiler if none was specified. -ifeq "$(COMPILER)" "" - COMPILER = VISUAL_CPP -endif - -# COMPILER_VERSION specifies the version of a particular compiler, if this is -# needed to distinguish how the code is built. -export COMPILER_VERSION - -############################################################################### - -# "TYPE" is the kind of product being generated by this project. this is -# used to decide where to put the final products of compilation. this is a -# variable in the user's makefile. -# Valid Types: -# TYPE = library (outputs are static or dynamic libraries) -# TYPE = application (outputs are main-line executables) -# TYPE = test (outputs are test programs) -export TYPE - -############################################################################### - -# pseudo-boolean variable section. if these have any value at all, then they -# are treated as being true. note that these are flags that should generally -# be passed on the command line to a make. if they are intended to be used -# from inside a makefile, then they must appear before this file is included. - -# "REBUILD" causes a rebuild of all source files if it's true. -export REBUILD - -# "DEBUG" is used to specify a debugging build. the default is for this to -# be false, which causes a release build. -export DEBUG - -# "OPTIMIZE" creates optimized code. -export OPTIMIZE - -# "NO_COMPILE" just runs through the targets without compiling. it still -# promotes headers however. -export NO_COMPILE - -# "BUILD_LIST_FILE" is the set of files that need to be recompiled for -# visual c++. -export BUILD_LIST_FILE = $(CLAM_TMP)/clam_rebuild.$(PROJECT) - -# "BUILD_WHACK_FILE" is the set of object files that should be removed if -# a build failure occurs. -export BUILD_WHACK_FILE = $(CLAM_TMP)/clam_whack.$(PROJECT) - -# we're adding the build list to the flag files so we know it gets cleaned up. -FLAG_FILES += $(BUILD_LIST_FILE) $(BUILD_WHACK_FILE) - -############################################################################### - -# This section implements the HOOPLE directory scheme. If your scheme differs, -# then you'll want to modify these appropriately. - -# "THIRD_PARTY_DIR" is the root of our support libraries. -ifeq "$(OP_SYSTEM)" "UNIX" - export THIRD_PARTY_DIR -endif -ifeq "$(OP_SYSTEM)" "WIN32" - export THIRD_PARTY_DIR = $(FEISTY_MEOW_APEX)/3rdparty -endif - -# "OUTPUT_ROOT" is the root of all output directories for objects and other -# products being built. -export OUTPUT_ROOT = $(TARGETS_STORE)/obj - -# "PLATFORM_ADD_IN" is an option discriminator for the intended execution -# platform. it should end in an underscore if it is provided. -#PLATFORM_ADD_IN = linux_ -#PLATFORM_ADD_IN = w32_ -PLATFORM_ADD_IN = - -# "CPU_BUILD_DIR" distinguishes object directories by including the cpu -# name and the type of build. -ifneq "$(DEBUG)" "" - CPU_BUILD_DIR = $(BASE_CPU)_dbg -else - CPU_BUILD_DIR = $(BASE_CPU)_$(PLATFORM_ADD_IN)rel -endif - -# "BASE_OUTPUT_PATH" is the parent directory of objects for this type of -# cpu and this type of build. -export BASE_OUTPUT_PATH = $(OUTPUT_ROOT)/$(CPU_BUILD_DIR) - -# "OUTPUT_PATH" is the directory to generate all compiled products into. -export OUTPUT_PATH = $(BASE_OUTPUT_PATH)/$(PROJECT) - -# "OBJECT_DIR" is where object files will be stored during compilation for the -# target type being produced. -export OBJECT_DIR = $(OUTPUT_PATH) - -# These specify where files are to be created or located for our local build. -export EXECUTABLE_DIR = $(TARGETS_STORE)/exe -export DYNAMIC_LIBRARY_DIR = $(TARGETS_STORE)/dll -export STATIC_LIBRARY_DIR = $(TARGETS_STORE)/lib -export TESTS_DIR = $(TARGETS_STORE)/tests - -# "HEADER_SEARCH_PATH" is where the class interface files are to be found. -#HEADER_SEARCH_PATH = - -# "HOOPLE_HEADERS" are locations where the HOOPLE headers can be found. -HOOPLE_HEADERS := $(shell $(FIND) $(FEISTY_MEOW_APEX)/source/lib_src $(FEISTY_MEOW_APEX)/libraries -mindepth 1 -maxdepth 1 -type d) - -# "LOCAL_HEADERS" are overrides that go first in the header search path. -#LOCAL_HEADERS = - -# "CODEBASE_HEADERS" is a list that can be changed for a particular codebase. -# it is guaranteed that clam will not interfere with this list, whereas -# the LOCAL_HEADERS can be modified by clam. -#CODEBASE_HEADERS = - -# "LOCAL_LIBRARIES" are overrides that go first in the library search path. -#LOCAL_LIBRARIES = - -# "LIBRARY_SEARCH_PATH" is where the library files are to be found. -#LIBRARY_SEARCH_PATH = - -# "HOOPLE_LIBRARIES" is where our local libraries are located. -HOOPLE_LIBRARIES = - -# "EXTRA_COPIES" is a list of files that are copied to a project's output -# directory. -export EXTRA_COPIES - -# "EXTRA_VERSIONS" is a list of version files to synchronize with the main -# library version for this build. if a file called "version.ini" exists in -# the project directory, then it will automatically be upgraded, so the -# extra version files are mainly useful when you have a project with multiple -# programs in it and you want them to have independent version files (as you -# should perhaps want). -export EXTRA_VERSIONS - -# "OMIT_VERSIONS" is another exclusion flag. this one turns off the creation -# of version resource files and eliminates any references that would include -# such files. this is needed when rebuilding version_stamper. -#OMIT_VERSIONS = t - -# Add the obligatory junk to be cleaned up. Individual compiler sections -# should customize this by adding their object output directories. -CLEANUPS += $(ACTUAL_TARGETS) $(OUTPUT_PATH) -#hmmm: import libs for dynamic libraries on ms-win32 don't currently get -# cleaned up nicely. - -############################################################################### - -# "SEARCH_DIRS" is a list of directories that should be searched for both C++ -# header files and for C++ code libraries. The items placed in SEARCH_DIRS -# are fed into both the LIBRARY_SEARCH_PATH and the HEADER_SEARCH_PATH. -#SEARCH_DIRS = - -# "DEFINITIONS" is a list of compiler flags that define the value of c macros. -# These usually have the format of -D, but in this variable, only the -# itself should be listed because the compiler option -D is added -# automatically. -DEFINITIONS = CLAM_BUILT - -ifneq "$(BOOT_STRAPPING)" "" - # the software is being built from the ground up, including the binaries - # we use for building (like value_tagger and others). - DEFINITIONS += BOOT_STRAPPING -endif - -# "UNDEFINITIONS" is a list of macros to undefine. -#UNDEFINITIONS = - -#hmmm: these kinds of defines (with a value) do not work for csharp. -# GLOBAL_PRODUCT_NAME is an important variable for tagging the entire code base -# with some branding. It is provided as a macro definition to all source -# files. The initial value for the macro should come from the build init -# file, but if it doesn't, we pick a default. -##ifeq "$(product_name)" "" -## DEFINITIONS += GLOBAL_PRODUCT_NAME=\\\"HOOPLE\\\" -##else -## DEFINITIONS += GLOBAL_PRODUCT_NAME=\\\"$(product_name)\\\" -##endif - -# *_PRODUCT_VERSION records parts of our version numbers for the code to see. -###DEFINITIONS += MAJOR_PRODUCT_VERSION=$(major) MINOR_PRODUCT_VERSION=$(minor) - -# "DEBUG_FLAGS" these flags are used for generating specialized versions of -# object files, such as ones that include debugging code or that add code for -# profiling. -# Possible values are -g for adding GDB debugging code and -pg for adding -# gprof profiling code. -#DEBUG_FLAGS = -g -#DEBUG_FLAGS = -pg -#DEBUG_FLAGS = - -# "COMPILER_FLAGS" are the flags for the pre-processor and compiler. -#COMPILER_FLAGS = - -# "STRICT_WARNINGS" turns on all warnings and forces them to be considered -# as errors when encountered. -#STRICT_WARNINGS = - -# "LIBRARIAN_FLAGS" are flags that need to be passed to the library tool -# that creates static code libraries. -#LIBRARIAN_FLAGS = - -# "SOURCE" is the list of files that are turned into objects. -#SOURCE = - -# "LIBS_USED" are system or compiler code libraries that the targets to be -# created depend upon. -#LIBS_USED = - -# "LOCAL_LIBS_USED" is very similar to the LIBS_USED, but these libraries -# actually cause executables and object files to be recompiled when the -# libraries specified have changed. To accomplish this, these libraries MUST -# be located in the STATIC_LIBRARY_DIR rather than at some arbitrary place -# on the LIBRARY_SEARCH_PATH. -#LOCAL_LIBS_USED = - -# Load flags tell the linker and loader how to deal with the files and where -# to locate library components. The prefix goes before object files are -# listed, and the suffix after. The prefix should have things like the -# directories to be searched for code libraries (although they should be added -# to LIBRARY_SEARCH_PATH) and the loading mode for functions (static/dynamic). -# In the suffix, actual library loading statements (like -lmath) can be -# included (although they should be listed in a different form in LIBS_USED). -# Remember that the unix loader looks for functions in libraries in a bizarre -# way: ld searches for a function only when it has already been asked for it. -# This means that it doesn't remember what functions it has already been -# provided with in the libraries and object files, and it will fail if those -# functions are only asked for after they have already been encountered. -#LOAD_FLAG_PREFIX = -#LOAD_FLAG_SUFFIX = - -# The prefix used on library names, mostly for unix. -LIB_PREFIX = -# The standard suffix for static or import libraries on this operating system. -LIB_ENDING = - -# Flag for specifying the library name to create. -#CREATE_LIBRARY_FLAG = - -# Flag for specifying a library to include in linking. -LIBRARY_NAME_FLAG = -l - -# Flag for specifying a directory to add to the search path for libs. -#LIBRARY_PATH_FLAG = -L - -# Flag for specifying the name of an output from the linker. -#LINKER_OUTPUT_FLAG = - -# Flag for separating linker options from compilation options for a combined -# compiler / linker. -#LINKER_OPTION_SEPARATOR = - -# Flag that passes special options when building executable programs. It is -# passed just before the LOAD_FLAG_PREFIX. -#EXE_FLAGS = - -# The name of the compiler tool. -#CC = - -# The name of the library creator tool. -#LIBRARY_TOOL = - -# the root name of the version file. This is currently irrelevant on -# non-win32 platforms. -VERSION_RC_ROOT = $(shell $(SHELL) $(CLAM_SCRIPTS)/cpp/rc_name.sh) - # we import the rc_name from our close ally, the c++ compiler definitions. - -############################################################################### - -# Compiler Dependent Flags -# -# "COMPILER_ROOT_DIR" is the top-level for the C++ compiler location. -# "COMPILER_HEADER_DIR" is where the compiler's headers are. -export COMPILER_HEADER_DIR -# "COMPILER_LIBRARY_DIR" is where archived libraries are. -# "CC" is the name of the C++ compiler to be used. - -ifeq "$(COMPILER)" "VISUAL_CPP" - # microsoft visual studio 7. - - LIB_ENDING = .dll - PLATFORM_ADD_IN = w32_ - - # these define special characteristics for a program being built. - # BASE is almost always defined and pulls in fundamental w32 support. - # RPC supplies the remote procedure call libraries. - # OLE pulls in object linking and embedding support. - # SECURITY links with the w32 security APIs. - # CLR sets options that are appropriate for managed code. - VCPP_USE_BASE=true - VCPP_USE_RPC= - VCPP_USE_OLE= - VCPP_USE_SECURITY= - VCPP_USE_CLR= - VCPP_VISTA_ICON= - - # the framework dir points at the .net framework to be used for compilation. - ifeq "$(FRAMEWORK_VERSION)" "" - - # older .net 1.1. -# SHORT_FRAMEWORK_VERSION = 1.1 -# FRAMEWORK_VERSION = $(SHORT_FRAMEWORK_VERSION).4322 - - # old .net 2.0. -# SHORT_FRAMEWORK_VERSION = 2.0 -# FRAMEWORK_VERSION = $(SHORT_FRAMEWORK_VERSION).50727 - - # current .net 3.5. - SHORT_FRAMEWORK_VERSION = 3.5 - FRAMEWORK_VERSION = $(SHORT_FRAMEWORK_VERSION) - - endif - export FRAMEWORK_DIR - ifeq "$(FRAMEWORK_DIR)" "" - FRAMEWORK_DIR = $(subst \,/,$(WINDIR))/Microsoft.NET/Framework/v$(FRAMEWORK_VERSION) - endif - - # pick a default compiler version for what we tend to use the most at the - # current time. - ifeq "$(COMPILER_VERSION)" "" - COMPILER_VERSION = 7 - endif -## DEFINITIONS += COMPILER_VERSION=$(COMPILER_VERSION) - # add a macro so programs can check what version is appropriate. - - # C# needs an entry point for exes. a different one can be specified also. - ENTRY_POINT = main - - # C# treats resources differently than simple code files. the list in this - # variable will be embedded in the target. - #RESX = - - # TLBEXPORT is a tool to create TLB files from DLL files. - TLBEXPORT = $(COMPILER_ROOT_DIR)/../SDK/v$(SHORT_FRAMEWORK_VERSION)/bin/tlbexp$(EXE_END) - - # calculate the visual studio root directory. - export VIS_STU_ROOT := $(shell $(SHELL) $(CLAM_SCRIPTS)/cpp/ms_root_dir.sh $(CLAM_BINARIES) ) - ifneq "$(VIS_STU_ROOT)" "" - COMPILER_ROOT_DIR = $(VIS_STU_ROOT)/vc# - endif - ifeq "$(COMPILER_ROOT_DIR)" "" - HOSEUP = $(shell echo The compiler directory is not set. Please define the environment ) - HOSEUP = $(shell echo variable VSxCOMNTOOLS to point at the folder where visual C++ is installed. ) - HOSEUP = - endif - - export COMPILER_VERSION = $(shell $(SHELL) $(CLAM_SCRIPTS)/cpp/get_version.sh $(COMPILER) $(COMPILER_ROOT_DIR) ) - - # set a variable for the resource compiler for old-style resources. - STANDARD_RC = $(VIS_STU_ROOT)/vc/bin/rc - - # set up a directory for debugging files to be stored. these are not - # moved with the postconditions--they are generated in place. - export PDB_DIR=$(TARGETS_STORE)/pdb - - # set these way up here so we can override them later. - CC = bash $(CLAM_SCRIPTS)/csharp/csharper.sh -##$(FRAMEWORK_DIR)/csc - -# LINK_TOOL = $(COMPILER_ROOT_DIR)/bin/link - - # vary the locations for compiler files based on the version. - COMPILER_HEADER_DIR = $(VIS_STU_ROOT)/vc/include $(VIS_STU_ROOT)/vc/atlmfc/include $(VIS_STU_ROOT)/vc/platformsdk/include - COMPILER_LIBRARY_DIR = -###$(COMPILER_ROOT_DIR)/lib $(COMPILER_ROOT_DIR)/atlmfc/lib $(COMPILER_ROOT_DIR)/platformsdk/lib - RC = $(COMPILER_ROOT_DIR)/../SDK/v2.0/bin/resgen$(EXE_END) - - ifeq "$(COMPILER_HEADER_DIR)" "" - HOSEUP = $(shell echo The compiler version is not set. Please define COMPILER_VERSION.) - endif - - DEFINITIONS += _Windows _WINDOWS WIN32 __WIN32__ __FLAT__ VC_EXTRALEAN WIN32_LEAN_AND_MEAN ATL_NO_LEAN_AND_MEAN _WIN32_WINNT=0x403 - DEF_FILE = - LIBRARY_TOOL = $(COMPILER_ROOT_DIR)/bin/lib - LOAD_FLAG_PREFIX = -nologo -#-subsystem:windows -machine:IX86 - LOAD_FLAG_SUFFIX = - - MIDL = midl -Oicf $(MIDL_DEFS) $(HEADER_SEARCH_PATH:%=-I% ) $(DEFINITIONS:%=-I% ) - MIDL_DEFS = -no_robust - - # set the flags used by visual c++. - CREATE_LIBRARY_FLAG = -out: - LIBRARY_NAME_FLAG = -reference: - LIBRARY_PATH_FLAG = -lib: - LINKER_OPTION_SEPARATOR = -link - LINKER_OUTPUT_FLAG = -out: - - # Add the extra files created by visual c++. -#is this needed now that we whack whole output path? CLEANUPS += $(OUTPUT_PATH)/*.*db - - # put the common flags into the compiler flags. - COMPILER_FLAGS += -nologo -#-Fd$(PDB_DIR)/$(PROJECT)_bookkeeping.pdb -GR -GX -W3 -Zi -EHsc -GS -Gd - - ifneq "$(DEBUG)" "" - # disable function inlining and optimizations for debug. -# COMPILER_FLAGS += -Ob0 -Od - else - # enable function inlining for release only. -# COMPILER_FLAGS += -Ob1 - - ifneq "$(OPTIMIZE)" "" - # add in fast code optimization. -#testing... -# COMPILER_FLAGS += -O2 -#trying O2 again although it seems to combust too easily. - else - # no optimizations. - endif - - endif - - # check if profiling is to be enabled. - PROFILER_FLAG = - ifneq "$(PROFILE)" "" - PROFILER_FLAG = -profile - endif - - # add the common linker flags. the debugging flag is added because we - # want to be able to debug into release code, but since the pdb files - # are separate, we're not exposing ourselves when we don't include them. - LOAD_FLAG_PREFIX += $(PROFILER_FLAG) -debug -#-warn:3 - - # "USE_MFC" dictates whether mfc should be allowed in the application. - # the default is not to use MFC extension style dlls. this can be turned - # on in the individual makefiles that require MFC. - #USE_MFC = - - # the library creator gets a couple of flags. - LIBRARIAN_FLAGS += -nologo -machine:IX86 - - # now, vary the flag configuration based on the flags that have been set. - - ifneq "$(CONSOLE_MODE)" "" - # console type of applications are built using the static flag so that - # they are more redistributable. - DEFINITIONS += _CONSOLE -### LOAD_FLAG_SUFFIX += -subsystem:console - STATIC = true - endif - - # dynamically linked library or application flags. - ifneq "$(DEBUG)" "" - # debug. - DEFINITIONS += _DEBUG -# COMPILER_FLAGS += -MDd - else - # release. - DEFINITIONS += NDEBUG -# COMPILER_FLAGS += -MD - endif - - ifneq "$(STRICT_WARNINGS)" "" -# COMPILER_FLAGS += -W3 -WX - # we have not turned on W4 because it is not really warnings for the - # microsoft compiler. instead, it is a bunch of blather about what the - # compiler intends to do rather than problems in the code. - endif - -endif - - diff --git a/scripts/z_outgoing/ms_root_dir.sh b/scripts/z_outgoing/ms_root_dir.sh deleted file mode 100644 index 6f7d21e3..00000000 --- a/scripts/z_outgoing/ms_root_dir.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -# spits out the root directory of visual studio, calculated from the common -# tools directory that always seems to be reliably set. - -# code snagged from vis_stu_vars... -if [ -z "$VSxTOOLS" ]; then - export VSxTOOLS="$VS90COMNTOOLS" - if [ -z "$VSxTOOLS" ]; then - export VSxTOOLS="$VS80COMNTOOLS" - fi -fi -if [ -z "$VSxTOOLS" ]; then - #echo Failure to locate visual studio tools. - # don't want to echo anything; need to be able to check that this provided nothing. - exit 33 -fi - -cygpath -w -s "$VSxTOOLS" | sed -e 's/\\/\//g' | sed -e 's/^\(.*\)\/[^\/]*\/[^\/]*[\/]$/\1/' - diff --git a/scripts/z_outgoing/vis_stu_vars.sh b/scripts/z_outgoing/vis_stu_vars.sh deleted file mode 100644 index 546d8627..00000000 --- a/scripts/z_outgoing/vis_stu_vars.sh +++ /dev/null @@ -1,110 +0,0 @@ -#!/bin/bash - -# this file attempts to provide all of the variables needed for compiling -# with the microsoft visual studio compiler (dot net version). it requires -# one environment variable (called VSxCOMNTOOLS) be set that points at the -# location of the common tools in the visual studio installation. -# The value of x can be 80, 90 or 100. - -function print_usage { - echo "The VS80COMNTOOLS, VS90COMNTOOLS and VS100COMNTOOLS variables are not set." - echo "This usually means that the Visual Studio compiler is not installed." - echo "" -} - -if [[ "$1" =~ .*help.* ]]; then - print_usage - exit 0 -fi - -function setup_visual_studio_variables() -{ - # we try to use the most recent compiler location, and work backwards as - # needed for the supported range (10 = vs 2010, 9 = vs 2008, 8 = vs 2005). - export VSxTOOLS="$VS100COMNTOOLS" - if [ -z "$VSxTOOLS" ]; then - export VSxTOOLS="$VS90COMNTOOLS" - if [ -z "$VSxTOOLS" ]; then - export VSxTOOLS="$VS80COMNTOOLS" - fi - fi - - if [ -z "$VSxTOOLS" ]; then - return 33 - fi - export VSxTOOLS="$(cygpath -w -s "$VSxTOOLS" | tr "A-Z" "a-z" | sed -e 's/\\/\//g' )" -#| sed -e 's/^\(.\):/\/\1/' )" - - export VIS_STU_ROOT="$(echo $VSxTOOLS | sed -e 's/^\(.*\)\/[^\/]*\/[^\/]*[\/]$/\1/' )" -#| sed -e 's/^\(.\):/\/\1/' )" - export VSINSTALLDIR="$VIS_STU_ROOT" - - export WINDIR="$(cygpath -w -s "$WINDIR" | tr A-Z a-z | sed -e 's/\\/\//g' )" -#| sed -e 's/^\(.\):/\/\1/' )" - - export VCINSTALLDIR="$VSINSTALLDIR/VC" - export VSCOMMONROOT="$VSINSTALLDIR/Common7" - export VS_TOOLS_DIR="$VSCOMMONROOT/tools" - export DevEnvDir="$VSCOMMONROOT/IDE" - export MSVCDir="$VCINSTALLDIR" - export FrameworkDir="$WINDIR/Microsoft.NET/Framework" - export FrameworkVersion=v4.0.30319 - #old export FrameworkSDKDir="$VSINSTALLDIR/SDK/v2.0" - - export PLATFORM_DIR="$VCINSTALLDIR/PlatformSDK" - if [ ! -d "$PLATFORM_DIR" ]; then - -#on hold: export PLATFORM_DIR="$(cygpath -w -s "$PROGRAMFILES/Microsoft SDKs/Windows/v7.0A" | tr "A-Z" "a-z" | sed -e 's/^\(.*\)\/[^\/]*\/[^\/]*[\/]$/\1/' )" -##| sed -e 's/^\(.\):/\/\1/' )" - - # guess at where we can find this damned directory in its short form. -#hmmm: this is needed until there's a replacement for short path, or we can build again. - export PLATFORM_DIR="c:/progra~2/micros~1/windows/v7.0a" - if [ ! -d "$PLATFORM_DIR" ]; then - PLATFORM_DIR="c:/progra~1/micros~1/windows/v7.0a" - if [ ! -d "$PLATFORM_DIR" ]; then - PLATFORM_DIR="c:/progra~1/micros~2/windows/v7.0a" - if [ ! -d "$PLATFORM_DIR" ]; then - PLATFORM_DIR="c:/progra~2/micros~2/windows/v7.0a" - fi - fi - fi - - if [ ! -d "$PLATFORM_DIR" ]; then - echo "*** Failure to calculate the platform directory based on several attempts using c:\\program files\\microsoft sdks\\windows\\v7.0a as the basic pattern" - fi - - - fi - export WindowsSdkDir="$PLATFORM_DIR" - - #echo "path before is $PATH" - local filena - for filena in "$DevEnvDir" "$VCINSTALLDIR/BIN" "$VSxTOOLS" "$VSxTOOLS/bin" "$FrameworkDir/$FrameworkVersion" "$FrameworkDir/v3.5" "$VCINSTALLDIR/VCPackages" "$VSINSTALLDIR/Common7/Tools" "$PLATFORM_DIR/bin"; do - export PATH="$PATH:$(dos_to_unix_path $filena)" - done - #echo "path after is $PATH" - - export INCLUDE="$VCINSTALLDIR/ATLMFC/INCLUDE:$VCINSTALLDIR/INCLUDE:$PLATFORM_DIR/include" - #:$FrameworkSDKDir/include" - - export LIB="$VCINSTALLDIR/ATLMFC/LIB:$VCINSTALLDIR/LIB:$PLATFORM_DIR/lib" - #:$FrameworkSDKDir/lib" - - # convert framework dir back or things yell like hell. - export FrameworkDir=$(unix_to_dos_path $FrameworkDir) - # the redirection of stderr to null is to get around an obnoxious cygwin - # warning that seems to be erroneously complaining about backslashes. - - ############## - - echo "calculated variables for dos/windoze builds:" - var VIS_STU_ROOT VSxTOOLS WINDIR VSxTOOLS VSINSTALLDIR PLATFORM_DIR FrameworkDir - - ############## -} - -# run the above, very nasty, function. -setup_visual_studio_variables - - -- 2.34.1