[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] odd/fruitbat 114b253: Attempt to build with cygwin-1
|
From: |
Greg Chicares |
|
Subject: |
[lmi-commits] [lmi] odd/fruitbat 114b253: Attempt to build with cygwin-1.7 |
|
Date: |
Fri, 3 May 2019 17:17:50 -0400 (EDT) |
branch: odd/fruitbat
commit 114b253baae57d23260bf4690254b346f6154d9b
Author: U-turgon\greg <address@hidden(none)>
Commit: U-turgon\greg <address@hidden(none)>
Attempt to build with cygwin-1.7
---
check_git_setup.sh | 2 +-
configuration.make | 2 +-
gui_test.sh | 2 +-
gwc/.zshrc | 3 +++
install_cygwin.bat | 8 +++++---
install_libxml2_libxslt.make | 4 ++--
install_mingw.make | 12 +++++++-----
install_msw.sh | 22 ++++++++++++----------
install_wx.sh | 8 +++++---
install_wxpdfdoc.sh | 2 +-
msw_cygwin.make | 10 ++--------
nychthemeral_test.sh | 6 +++---
test_coding_rules_test.sh | 2 +-
workhorse.make | 2 +-
14 files changed, 45 insertions(+), 40 deletions(-)
diff --git a/check_git_setup.sh b/check_git_setup.sh
index 08117fd..e5e0070 100755
--- a/check_git_setup.sh
+++ b/check_git_setup.sh
@@ -34,7 +34,7 @@ printf '"%s" is git toplevel directory\n' "$toplevel"
#'core.filemode' is "false". See:
# https://lists.nongnu.org/archive/html/lmi/2017-11/msg00018.html
-lmi_build_type=$(/usr/share/libtool/build-aux/config.guess)
+lmi_build_type=$(/usr/share/libtool/config/config.guess)
case "$lmi_build_type" in
(*-*-cygwin*)
printf 'cygwin detected\n'
diff --git a/configuration.make b/configuration.make
index 7dcd910..b0ed7de 100644
--- a/configuration.make
+++ b/configuration.make
@@ -23,7 +23,7 @@
# Include platform-specific makefile.
-lmi_build_type := $(shell /usr/share/libtool/build-aux/config.guess)
+lmi_build_type := $(shell /usr/share/libtool/config/config.guess)
ifeq (msys,$(findstring msys,$(lmi_build_type)))
platform_makefile := msw_msys.make
diff --git a/gui_test.sh b/gui_test.sh
index fab1d3c..0819d04 100755
--- a/gui_test.sh
+++ b/gui_test.sh
@@ -36,7 +36,7 @@ set -e
# provides no convenient alternative):
setopt PIPE_FAIL
-lmi_build_type=$(/usr/share/libtool/build-aux/config.guess)
+lmi_build_type=$(/usr/share/libtool/config/config.guess)
case "$lmi_build_type" in
(*-*-linux*)
PERFORM=wine
diff --git a/gwc/.zshrc b/gwc/.zshrc
index 4a35a4a..233a349 100644
--- a/gwc/.zshrc
+++ b/gwc/.zshrc
@@ -28,6 +28,9 @@ export LANG=en_US.UTF-8 LC_ALL=C.UTF-8 LC_TIME=en_DK.UTF-8
LC_COLLATE=C.UTF-8
# but it seems to be necessary nevertheless.
export LESSCHARSET=utf-8
+bindkey "\e[3~" delete-char
+bindkey "\e[1~" beginning-of-line
+bindkey "\e[4~" end-of-line
# bindkey "\e[3~" delete-char # Del
# bindkey '\e[H' beginning-of-line # Home
# bindkey '\e[F' end-of-line # End
diff --git a/install_cygwin.bat b/install_cygwin.bat
index ecd1254..9d7be03 100644
--- a/install_cygwin.bat
+++ b/install_cygwin.bat
@@ -26,6 +26,8 @@
IF EXIST C:\cygwin\NUL GOTO FoundOldInstallation
IF EXIST C:\cygwin64_lmi\NUL GOTO FoundOldInstallation
address@hidden MinGW_ no longer wanted
+
C:
cd C:\cache_for_lmi
START "Installing Cygwin" /WAIT setup-x86_64 ^
@@ -35,9 +37,9 @@ START "Installing Cygwin" /WAIT setup-x86_64 ^
"autoconf,automake,bsdtar,dos2unix,doxygen,gdb,git,libtool,make,openssh,patch,pkg-config,rsync,unzip,wget,zip,zsh"
cd C:\cygwin64_lmi\etc
echo # >> fstab
-echo C:/opt/lmi/MinGW-7_3_0 /MinGW_ lmi_specific binary,user 0 0 >>
fstab
-echo C:/opt/lmi /opt/lmi lmi_specific binary,user 0 0 >>
fstab
-echo C:/cache_for_lmi /cache_for_lmi lmi_specific binary,user 0 0 >>
fstab
+echo C:/opt/lmi/MinGW-7_3_0 /MinGW_ lmi_specific binary,user,noacl 0 0
>> fstab
+echo C:/opt/lmi /opt/lmi lmi_specific binary,user,noacl 0 0
>> fstab
+echo C:/cache_for_lmi /cache_for_lmi lmi_specific binary,user,noacl 0 0
>> fstab
echo Cygwin installation seems to have succeeded
GOTO End
diff --git a/install_libxml2_libxslt.make b/install_libxml2_libxslt.make
index 77d44a5..fb3c83e 100644
--- a/install_libxml2_libxslt.make
+++ b/install_libxml2_libxslt.make
@@ -46,7 +46,7 @@ host_path := libxml2
$(xz_version).tar.gz: host := https://sourceforge.net
$(xz_version).tar.gz: host_path := projects/lzmautils/files
-mingw_dir := /MinGW_
+mingw_dir := /opt/lmi/mingw
LMI_COMPILER ?= gcc
LMI_TRIPLET ?= i686-w64-mingw32
@@ -67,7 +67,7 @@ build_dir := $(prefix)/../xml-ad_hoc
mingw_bin_dir :=
-lmi_build_type := $(shell /usr/share/libtool/build-aux/config.guess)
+lmi_build_type := $(shell /usr/share/libtool/config/config.guess)
ifeq (cygwin,$(findstring cygwin,$(lmi_build_type)))
mingw_bin_dir := $(mingw_dir)/bin/
diff --git a/install_mingw.make b/install_mingw.make
index 4f5f1ea..81d0456 100644
--- a/install_mingw.make
+++ b/install_mingw.make
@@ -42,11 +42,11 @@ file_list = $($(version))
# http://article.gmane.org/gmane.comp.gnu.mingw.user/14748
# [2005-01-17T18:15:26Z from Aaron W. LaFramboise]
-prefix := /MinGW_
+prefix := /opt/lmi/mingw
cache_dir := /cache_for_lmi/downloads
-ad_hoc_dir := $(prefix)/ad_hoc
+ad_hoc_dir := /opt/lmi/zzz/mingw-ad_hoc/ad_hoc
# In the past, it seemed necessary to specify a mirror, e.g.:
# mirror := http://easynews.dl.sourceforge.net/sourceforge/mingw
@@ -105,8 +105,8 @@ ad_hoc_dir_exists = \
.PHONY: all
all: $(file_list)
- $(CP) --archive $(ad_hoc_dir)/mingw32 $(prefix)
- $(RM) --force --recursive $(ad_hoc_dir)
+ $(CP) --archive $(ad_hoc_dir)/mingw32/* $(prefix)
+ -$(RM) --force --recursive $(ad_hoc_dir)
$(file_list): initial_setup
@@ -129,4 +129,6 @@ WGETFLAGS := --no-verbose
cd $(cache_dir) && [ -e $@ ] || $(WGET) $(WGETFLAGS) $(mirror)/$@
cd $(cache_dir) && $(ECHO) "$(address@hidden) *$@" | $(MD5SUM) --check
$(BSDTAR) --extract $(BSDTARFLAGS) --directory=$(ad_hoc_dir)
--file=$(cache_dir)/$@ \
- || c:/Program\ Files/7-Zip/7z x `cygpath -w
$(cache_dir)/address@hidden -o$(ad_hoc_dir)
+ || c:/Program\ Files/7-Zip/7z x `cygpath -w
$(cache_dir)/address@hidden -o$(ad_hoc_dir) \
+ || c:/Program\ Files\ \(x86\)/7-Zip/7z x `cygpath -w
$(cache_dir)/address@hidden -o`cygpath -w $(ad_hoc_dir)`
+
diff --git a/install_msw.sh b/install_msw.sh
index 5463f67..cbe39b4 100755
--- a/install_msw.sh
+++ b/install_msw.sh
@@ -48,7 +48,7 @@ then
export coefficiency='--jobs=4'
fi
-lmi_build_type=$(/usr/share/libtool/build-aux/config.guess)
+lmi_build_type=$(/usr/share/libtool/config/config.guess)
case "$lmi_build_type" in
(*-*-cygwin*)
@@ -189,11 +189,11 @@ if [ "Cygwin" = "$platform" ]
then
# For Cygwin, install and use this msw-native compiler.
rm --force --recursive /MinGW_
- make $coefficiency --output-sync=recurse -f install_mingw.make
+ make $coefficiency -f install_mingw.make
fi
-make $coefficiency --output-sync=recurse -f install_miscellanea.make clobber
-make $coefficiency --output-sync=recurse -f install_miscellanea.make
+make $coefficiency -f install_miscellanea.make clobber
+make $coefficiency -f install_miscellanea.make
# This for-loop can iterate over as many toolchains as desired.
# Make sure the current production architecture is built last, so that
@@ -203,7 +203,7 @@ export LMI_TRIPLET
#for LMI_TRIPLET in x86_64-w64-mingw32 i686-w64-mingw32 ;
for LMI_TRIPLET in i686-w64-mingw32 ;
do
- make $coefficiency --output-sync=recurse -f install_libxml2_libxslt.make
+ make $coefficiency -f install_libxml2_libxslt.make
./install_wx.sh
./install_wxpdfdoc.sh
@@ -212,10 +212,10 @@ do
export
PATH=/opt/lmi/"${LMI_COMPILER}_${LMI_TRIPLET}"/local/bin:/opt/lmi/"${LMI_COMPILER}_${LMI_TRIPLET}"/local/lib:$minimal_path
- make $coefficiency --output-sync=recurse wx_config_check
- make $coefficiency --output-sync=recurse show_flags
- make $coefficiency --output-sync=recurse clean
- make $coefficiency --output-sync=recurse install
+ make $coefficiency wx_config_check
+ make $coefficiency show_flags
+ make $coefficiency clean
+ make $coefficiency install
if [ "Cygwin" = "$platform" ]
then
@@ -291,7 +291,9 @@ if [ "$inhibit_git_clone" != 1 ]
then
if [ -d /opt/lmi/src/lmi-moved-"$stamp0" ]
then
- cd /opt/lmi/src && mv lmi lmi-new-"$stamp0" && mv lmi-moved-"$stamp0" lmi
+ true
+# cd /opt/lmi/src && mv lmi lmi-new-"$stamp0" && mv lmi-moved-"$stamp0" lmi
+ true
fi
fi
diff --git a/install_wx.sh b/install_wx.sh
index 13f0da7..427e93a 100755
--- a/install_wx.sh
+++ b/install_wx.sh
@@ -46,7 +46,7 @@ LMI_TRIPLET=${LMI_TRIPLET:-"i686-w64-mingw32"}
# Variables that normally should be left alone
#################################
-mingw_dir=/MinGW_
+mingw_dir=/opt/lmi/mingw
prefix=/opt/lmi/"${LMI_COMPILER}_${LMI_TRIPLET}"/local
exec_prefix="$prefix"
@@ -75,10 +75,12 @@ then
git fetch origin
fi
-git checkout "$wx_commit_sha"
+# Suppress stuff that doesn't work in cygwin-1.7
+
+#git checkout "$wx_commit_sha"
# Get any new submodules that may have been added, even if nested.
-git submodule update "$coefficiency" --recursive --init
+#git submodule update "$coefficiency" --recursive --init
build_type=$("$proxy_wx_dir"/config.guess)
diff --git a/install_wxpdfdoc.sh b/install_wxpdfdoc.sh
index 039fa93..b58ec1c 100755
--- a/install_wxpdfdoc.sh
+++ b/install_wxpdfdoc.sh
@@ -46,7 +46,7 @@ LMI_TRIPLET=${LMI_TRIPLET:-"i686-w64-mingw32"}
# Variables that normally should be left alone
#################################
-mingw_dir=/MinGW_
+mingw_dir=/opt/lmi/mingw
prefix=/opt/lmi/"${LMI_COMPILER}_${LMI_TRIPLET}"/local
exec_prefix="$prefix"
diff --git a/msw_cygwin.make b/msw_cygwin.make
index e4cc042..c9bf07e 100644
--- a/msw_cygwin.make
+++ b/msw_cygwin.make
@@ -54,13 +54,7 @@ system_root := /cygdrive/c
# Full path to gcc binaries, slash-terminated if nonempty. Setting it
# to an empty string finds gcc on $PATH instead.
-ifeq (i686-w64-mingw32,$(LMI_TRIPLET))
- gcc_bin_dir := /MinGW_/mingw32/bin/
-else ifeq (x86_64-w64-mingw32,$(LMI_TRIPLET))
- gcc_bin_dir := /MinGW_/mingw64/bin/
-else
- $(warning Unexpected triplet '$(LMI_TRIPLET)')
-endif
+gcc_bin_dir := /opt/lmi/mingw/bin/
# Oddly, MinGW-w64 provides prefixed versions of compilers, e.g.:
# i686-w64-mingw32-gcc.exe
@@ -85,7 +79,7 @@ RC := $(gcc_bin_dir)$(host_hyphen)windres
# https://cygwin.com/ml/cygwin/2010-09/msg00553.html
# Of course manipulating an lmi user's $PATH is out of the question.
-compiler_sysroot := /MinGW_/$(LMI_TRIPLET)/lib
+compiler_sysroot := /opt/lmi/mingw/$(LMI_TRIPLET)/lib
compiler_runtime_files := \
$(wildcard $(compiler_sysroot)/libgcc*.dll) \
diff --git a/nychthemeral_test.sh b/nychthemeral_test.sh
index 8c4fb90..df6c145 100755
--- a/nychthemeral_test.sh
+++ b/nychthemeral_test.sh
@@ -36,7 +36,7 @@ set -e
# provides no convenient alternative):
setopt PIPE_FAIL
-lmi_build_type=$(/usr/share/libtool/build-aux/config.guess)
+lmi_build_type=$(/usr/share/libtool/config/config.guess)
case "$lmi_build_type" in
(*-*-linux*)
PERFORM=wine
@@ -152,7 +152,7 @@ make "$coefficiency" install check_physical_closure 2>&1 \
printf 'Production system built--ready to start GUI test in another
session.\n' > /dev/tty
printf '\n# cgi and cli tests\n\n'
-make "$coefficiency" --output-sync=recurse cgi_tests cli_tests 2>&1 \
+make "$coefficiency" cgi_tests cli_tests 2>&1 \
| tee "$log_dir"/cgi_cli | sed -e "$build_clutter" -e "$cli_cgi_clutter"
if [ "i686-w64-mingw32" = "$LMI_TRIPLET" ]
@@ -173,7 +173,7 @@ make "$coefficiency" all build_type=so_test
USE_SO_ATTRIBUTES=1 2>&1 \
| tee "$log_dir"/so_test | sed -e "$build_clutter"
printf '\n# cgi and cli tests in libstdc++ debug mode\n\n'
-make "$coefficiency" --output-sync=recurse cgi_tests cli_tests
build_type=safestdlib 2>&1 \
+make "$coefficiency" cgi_tests cli_tests build_type=safestdlib 2>&1 \
| tee "$log_dir"/cgi_cli_safestdlib | sed -e "$build_clutter" -e
"$cli_cgi_clutter"
printf '\n# unit tests in libstdc++ debug mode\n\n'
diff --git a/test_coding_rules_test.sh b/test_coding_rules_test.sh
index 4bd226e..fc74417 100755
--- a/test_coding_rules_test.sh
+++ b/test_coding_rules_test.sh
@@ -361,7 +361,7 @@ touch another.unexpected.file
# Compare observed to expected. Note that directory '.' is ignored.
-lmi_build_type=$(/usr/share/libtool/build-aux/config.guess)
+lmi_build_type=$(/usr/share/libtool/config/config.guess)
case "$lmi_build_type" in
(*-*-linux*)
PERFORM=wine
diff --git a/workhorse.make b/workhorse.make
index ce1fd82..a4a5127 100644
--- a/workhorse.make
+++ b/workhorse.make
@@ -1288,7 +1288,7 @@ configurable_settings.xml:
.PHONY: unit_tests
unit_tests: $(test_data)
@-$(MAKE) --file=$(this_makefile) build_unit_tests
- @ $(MAKE) --file=$(this_makefile) --output-sync=recurse run_unit_tests
+ @ $(MAKE) --file=$(this_makefile) run_unit_tests
.PHONY: build_unit_tests
build_unit_tests: configurable_settings.xml $(unit_test_targets)