From: Fred T. Hamster <fred@gruntose.com>
Date: Thu, 26 May 2022 11:19:23 +0000 (-0400)
Subject: slightly closer to doze builds
X-Git-Tag: 2.140.136^2~61
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=49620656530053aec1cc10157d63cd52bf7e8168;p=feisty_meow.git

slightly closer to doze builds

got the clam bins to build at least, and with right architecture.
---

diff --git a/scripts/clam/cpp/rc_name.sh b/scripts/clam/cpp/rc_name.sh
new file mode 100644
index 00000000..d069d35b
--- /dev/null
+++ b/scripts/clam/cpp/rc_name.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+if [ -f version.ini ]; then 
+  grep "root *=" version.ini | sed -e "s/root *= *//" -e "s/ *$//"
+fi
diff --git a/scripts/clam/cpp/rules.def b/scripts/clam/cpp/rules.def
index 292e769f..bf3764af 100644
--- a/scripts/clam/cpp/rules.def
+++ b/scripts/clam/cpp/rules.def
@@ -92,7 +92,7 @@ ifeq "$(COMPILER)" "GNU_WINDOWS"
     LOAD_FLAG_PREFIX += $(shell wx-config --libs $(UNICODE_FLAG_ADD) )
   endif
 
-LOAD_FLAG_PREFIX += -lwsock32 -lmswsock -shared
+#hmmm: LOAD_FLAG_PREFIX += -lwsock32 -lmswsock -shared
 
   ifneq "$(USE_CURL)" ""
     COMPILER_FLAGS += `curl-config --cflags`
@@ -234,34 +234,13 @@ endif
 ACTUAL_FIRST_TARGETS = check_requirements $(EXTRA_FIRST_TARGETS) $(VERSION_TARGET) $(FIRST_TARGETS) pre_compilation
 
 # Adds the primary targets to the list of products to create.
-#ifeq "$(NO_COMPILE)" ""
-
-  ifneq "$(OP_SYSTEM)" "WIN32"
-    ACTUAL_TARGETS1 = $(TARGETS:%.exe=$(EXECUTABLE_DIR)/%)
-  else
-    ACTUAL_TARGETS1 = $(TARGETS:%.exe=$(EXECUTABLE_DIR)/%.exe)
-  endif
-
-  ifneq "$(OP_SYSTEM)" "WIN32"
-    ACTUAL_TARGETS2 = $(ACTUAL_TARGETS1:%.dll=%.so)
-    ACTUAL_TARGETS3 = $(ACTUAL_TARGETS2:%.so=$(DYNAMIC_LIBRARY_DIR)/%$(TRIPART_VERSION).so)
-  else
-    ACTUAL_TARGETS2 = $(ACTUAL_TARGETS1:%.so=%.dll)
-    ACTUAL_TARGETS3 = $(ACTUAL_TARGETS2:%.dll=$(DYNAMIC_LIBRARY_DIR)/%$(TRIPART_VERSION).dll)
-  endif
-
-  ACTUAL_TARGETS4 = $(ACTUAL_TARGETS3:%.lib=$(STATIC_LIBRARY_DIR)/%$(TRIPART_VERSION).library)
-  ACTUAL_TARGETS = $(ACTUAL_TARGETS4:%.elf=$(EXECUTABLE_DIR)/%.elf)
-
-#else #is no_compile
-#  ACTUAL_TARGETS1 = $(TARGETS:%.exe=)
-#  ACTUAL_TARGETS2 = $(ACTUAL_TARGETS1:%.dll=)
-#  ACTUAL_TARGETS3 = $(ACTUAL_TARGETS2:%.so=)
-#  ACTUAL_TARGETS4 = $(ACTUAL_TARGETS3:%.lib=)
-#  ACTUAL_TARGETS = $(ACTUAL_TARGETS4:%.elf=)
-#endif
+ACTUAL_TARGETS1 = $(TARGETS:%.exe=$(EXECUTABLE_DIR)/%)
+ACTUAL_TARGETS2 = $(ACTUAL_TARGETS1:%.dll=%.so)
+ACTUAL_TARGETS3 = $(ACTUAL_TARGETS2:%.so=$(DYNAMIC_LIBRARY_DIR)/%$(TRIPART_VERSION).so)
+ACTUAL_TARGETS4 = $(ACTUAL_TARGETS3:%.lib=$(STATIC_LIBRARY_DIR)/%$(TRIPART_VERSION).library)
+ACTUAL_TARGETS = $(ACTUAL_TARGETS4:%.elf=$(EXECUTABLE_DIR)/%.elf)
 
-# Adds the last few targets for CLAM to do.
+# Adds the last few targets that CLAM works on.
 ACTUAL_LAST_TARGETS = post_compilation $(LAST_TARGETS)
 
 ############################################################################
@@ -338,6 +317,7 @@ cpp_add_to_cleanups_variable:
 $(OBJECT_DIR)/%.obj: $(CURRENT_DIR)/%.cpp
 ifeq "$(NO_COMPILE)" ""
 	@echo Compiling Object [$(notdir $@)]
+	@echo cmd: $(CATCHER)$(CC) $(COMPILER_FLAGS) -c $< $(OBJECT_NAME_FLAG)$@
 	$(HIDESH)-c 'if [ ! -d $(@D) ]; then mkdir $(@D); fi'
 	$(CATCHER)$(CC) $(COMPILER_FLAGS) -c $< $(OBJECT_NAME_FLAG)$@
 endif
@@ -355,7 +335,7 @@ endif
 
 ############################################################################
 
-# resource compiler for win32.
+# resource compiler for windoze.
 
 # we currently do not use rc files.
 $(OBJECT_DIR)/%.res: %.rc
diff --git a/scripts/clam/cpp/variables.def b/scripts/clam/cpp/variables.def
index 4668e33c..24b8148c 100644
--- a/scripts/clam/cpp/variables.def
+++ b/scripts/clam/cpp/variables.def
@@ -382,7 +382,7 @@ LIBRARY_PATH_FLAG = -L
 #LIBRARY_TOOL =
 
 # the root name of the version file.  This is currently irrelevant on
-# non-win32 platforms.
+# non-windoze platforms.
 VERSION_RC_ROOT = $(shell $(SHELL) $(CLAM_SCRIPTS)/cpp/rc_name.sh)
 
 ifneq "$(CONSOLE_MODE)" ""
@@ -395,20 +395,10 @@ endif
 ###############################################################################
 
 # Operating system dependent flags.
+# (not so OS dependent with move to only gnu compilation...)
 
-ifeq "$(OP_SYSTEM)" "UNIX"
-  LIB_ENDING = .a
-  DYNLIB_ENDING = .so
-endif
-ifeq "$(OP_SYSTEM)" "WIN32"
-#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
+LIB_ENDING = .a
+DYNLIB_ENDING = .so
 
 ###############################################################################
 
@@ -573,13 +563,14 @@ endif
 ifeq "$(COMPILER)" "GNU_WINDOWS"
   # GNU compiler for MS Windoze...
   CC = g++
-  ifeq "$(COMPILER_ROOT_DIR)" ""
-    COMPILER_ROOT_DIR = $(CYGROOT)
-  endif
+  COMPILER_ROOT_DIR = /
+  ARCHITECTURE = $(shell machine 2>/dev/null || arch 2>/dev/null || echo i686)
+#hmmm: below fixes nothing!  argh!
+#  ARCHITECTURE = i386
 
   export COMPILER_VERSION = $(shell $(SHELL) $(CLAM_SCRIPTS)/cpp/get_version.sh $(COMPILER) $(COMPILER_ROOT_DIR) )
 
-  RC := $(COMPILER_ROOT_DIR)/bin/windres
+#  RC := $(COMPILER_ROOT_DIR)/bin/windres
   PLATFORM_ADD_IN = w32_
 
   COMPILER_HEADER_DIR = $(COMPILER_ROOT_DIR)/include $(COMPILER_ROOT_DIR)/include/c++/3.4.2 
diff --git a/scripts/clam/variables.def b/scripts/clam/variables.def
index 809f79e5..03f17772 100644
--- a/scripts/clam/variables.def
+++ b/scripts/clam/variables.def
@@ -201,13 +201,6 @@ ifeq "$(CLAM_TMP)" ""
   CLAM_TMP := $(FEISTY_MEOW_GENERATED_STORE)/clam_tmp
 endif
 
-#turned off for the moment, since this seems like a bad idea; we define clam tmp in terms of tmp sometimes, do not we???
-#ifeq "$(OP_SYSTEM)" "WIN32"
-#  # set these so that compilers and such will use them.
-#  export TMP := $(CLAM_TMP)
-#  export TEMP := $(CLAM_TMP)
-#endif
-
 # "FAILURE_FILE" is a file that is used as a flag to track failures.  if the
 # file exists, then it is assumed that a failure happened during the current
 # make.
diff --git a/scripts/customize/fred/fred_variables.sh b/scripts/customize/fred/fred_variables.sh
index edb62df8..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/others/id_rsa_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/customize/fred/scripts/rip_burn/create_disco_dirs.sh b/scripts/customize/fred/scripts/rip_burn/create_disco_dirs.sh
index ea0c2d00..ff273ba8 100644
--- a/scripts/customize/fred/scripts/rip_burn/create_disco_dirs.sh
+++ b/scripts/customize/fred/scripts/rip_burn/create_disco_dirs.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 
-mkdir -p $HOME/disco
+mkdir $HOME/disco
 pushd $HOME/disco &>/dev/null
-mkdir -p burn converted grind rip workshop
+mkdir -p burn converted grind rip
 popd &>/dev/null
 
diff --git a/scripts/generator/build_variables.sh b/scripts/generator/build_variables.sh
index 0856f06c..2db3e06e 100644
--- a/scripts/generator/build_variables.sh
+++ b/scripts/generator/build_variables.sh
@@ -208,10 +208,7 @@ if [ -z "$got_bad" ]; then
   
   # load up the helper variables for visual studio on winders.
   if [ "$OPERATING_SYSTEM" == "WIN32" ]; then
-#no.    source "$BUILD_SCRIPTS_PATH/vis_stu_vars.sh"
-    # we are trying to move back to our good path of using gcc, not visual studio.
-    # the visual studio rig was for version 6?  a long time ago, and has withered
-    # on the vine.  meanwhile gnu cc is still cooking along and available.
+    # moved back to the good path of using gcc, not visual studio.
 #what vars needed?
 #trying just unixy ones, since we're doing cygwin on doze.
 export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$TARGETS_STORE"