From ebadf7f07e06e24241ec7286cdb1342ee3b4686f Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Fri, 6 Jul 2018 10:45:11 +0300 Subject: [PATCH 001/212] move prepare-apache.sh to Makefile --- .gitignore | 2 ++ Makefile | 63 +++++++++++++++++++++++++++++++++++++++-------- Makefile.linux.mk | 4 ++- README.md | 1 - prepare-apache.sh | 52 -------------------------------------- 5 files changed, 58 insertions(+), 64 deletions(-) delete mode 100755 prepare-apache.sh diff --git a/.gitignore b/.gitignore index e35b39334..3546bec60 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ httpd-* apr-* build +extlib +source/version.h diff --git a/Makefile b/Makefile index 4946811d2..484309909 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,17 @@ # 64=1 builds 64bit binary # DEBUG=1 builds debug binary version -64=1 +HTTPD24_VERSION=2.4.33 +HTTPD22_VERSION=2.2.34 +APR_VERSION=1.6.3 +APR_UTIL_VERSION=1.6.1 + +ifdef 32 + +else + 64=1 +endif + # DEBUG=1 VERSION := 4.1.0 @@ -30,7 +40,7 @@ ifneq ("$(PROGRAMFILES)$(ProgramFiles)","") SED := cmd /c sed.exe ECHO := cmd /c echo MKDIR := cmd /c mkdir - CP := cmd /c copy /Y + CP := cmd /c copy /E /Y CD := cd EXEC := REVISION := Revision: $(shell git rev-parse --short HEAD) @@ -41,6 +51,9 @@ ifneq ("$(PROGRAMFILES)$(ProgramFiles)","") COMPILEFLAG=/ COMPILEOPTS=/Fd$@.pdb /Fo$(dir $@) OBJ=obj + UTAR=7z x + UBZIP=7z x + WGET=powershell /c Invoke-WebRequest else OS_ARCH := $(shell uname -s) OS_MARCH := $(shell uname -m) @@ -49,7 +62,7 @@ else SED := sed ECHO := echo MKDIR := mkdir -p - CP := cp + CP := cp -r CD := cd EXEC := ./ REVISION := Revision: $(shell git rev-parse --short HEAD) @@ -60,6 +73,9 @@ else COMPILEFLAG=- COMPILEOPTS=-c -o $@ OBJ=o + UTAR=tar xf + UBZIP=bunzip2 + WGET=wget endif SED_ROPT := r @@ -74,7 +90,9 @@ endif PS=$(strip $(PATHSEP)) CFLAGS := $(COMPILEFLAG)I.$(PS)source $(COMPILEFLAG)I.$(PS)zlib $(COMPILEFLAG)I.$(PS)expat $(COMPILEFLAG)I.$(PS)pcre \ - $(COMPILEFLAG)DHAVE_EXPAT_CONFIG_H $(COMPILEFLAG)DHAVE_PCRE_CONFIG_H $(COMPILEFLAG)DAM_BINARY_LICENSE + $(COMPILEFLAG)DHAVE_EXPAT_CONFIG_H $(COMPILEFLAG)DHAVE_PCRE_CONFIG_H + +DIR := ${CURDIR} OBJDIR := build APACHE_SOURCES := source/apache/agent.c @@ -111,13 +129,15 @@ TEST_SOURCES := $(wildcard cmocka/*.c) $(wildcard tests/*.c) TEST_OBJECTS := $(addprefix $(OBJDIR)/,$(TEST_SOURCES:.c=.$(OBJ))) $(APACHE_OUT_OBJS): CFLAGS += $(COMPILEFLAG)Iextlib/$(OS_ARCH)_$(OS_MARCH)/apache24/include \ - $(COMPILEFLAG)Iextlib/$(OS_ARCH)$(OS_MARCH)/apache24/include \ - $(COMPILEFLAG)Iextlib/$(OS_ARCH)/apache24/include $(COMPILEFLAG)DAPACHE2 $(COMPILEFLAG)DAPACHE24 + $(COMPILEFLAG)Iextlib/$(OS_ARCH)_$(OS_MARCH)/apache24/srclib/apr/include \ + $(COMPILEFLAG)Iextlib/$(OS_ARCH)_$(OS_MARCH)/apache24/srclib/apr-util/include \ + $(COMPILEFLAG)DAPACHE2 $(COMPILEFLAG)DAPACHE24 $(VARNISH_OUT_OBJS): CFLAGS += $(COMPILEFLAG)Iextlib/$(OS_ARCH)/varnish/include $(VARNISH3_OUT_OBJS): CFLAGS += $(COMPILEFLAG)Iextlib/$(OS_ARCH)/varnish3/include $(APACHE22_OUT_OBJS): CFLAGS += $(COMPILEFLAG)Iextlib/$(OS_ARCH)_$(OS_MARCH)/apache22/include \ - $(COMPILEFLAG)Iextlib/$(OS_ARCH)$(OS_MARCH)/apache22/include \ - $(COMPILEFLAG)Iextlib/$(OS_ARCH)/apache22$(VENDOR_EXT)/include $(COMPILEFLAG)DAPACHE2 + $(COMPILEFLAG)Iextlib/$(OS_ARCH)_$(OS_MARCH)/apache22/srclib/apr/include \ + $(COMPILEFLAG)Iextlib/$(OS_ARCH)_$(OS_MARCH)/apache22/srclib/apr-util/include \ + $(COMPILEFLAG)DAPACHE2 $(TEST_OBJECTS): CFLAGS += $(COMPILEFLAG)I.$(PS)cmocka $(COMPILEFLAG)I.$(PS)tests $(COMPILEFLAG)I.$(PS)$(OBJDIR)$(PS)tests \ $(COMPILEFLAG)DHAVE_SIGNAL_H $(COMPILEFLAG)DUNIT_TEST @@ -195,9 +215,32 @@ test_includes: $(ECHO) "};" >> $(OBJDIR)$(PS)tests$(PS)tests.h $(SED) -ie "s$(SUB)\"$(SUB) $(SUB)g" $(OBJDIR)$(PS)tests$(PS)tests.h +apr: + -$(WGET) http://mirrors.ukfast.co.uk/sites/ftp.apache.org/apr/apr-${APR_VERSION}.tar.bz2 + -$(UBZIP) apr-${APR_VERSION}.tar.bz2; $(UTAR) apr-${APR_VERSION}.tar + -$(WGET) http://mirrors.ukfast.co.uk/sites/ftp.apache.org/apr/apr-util-${APR_UTIL_VERSION}.tar.bz2 + -$(UBZIP) apr-util-${APR_UTIL_VERSION}.tar.bz2; $(UTAR) apr-util-${APR_UTIL_VERSION}.tar +apache-src: apr + -$(WGET) http://mirrors.ukfast.co.uk/sites/ftp.apache.org/httpd/httpd-${HTTPD24_VERSION}.tar.bz2 + -$(UBZIP) httpd-${HTTPD24_VERSION}.tar.bz2; $(UTAR) httpd-${HTTPD24_VERSION}.tar + -$(MKDIR) extlib/$(OS_ARCH)_$(OS_MARCH) + -$(CP) httpd-${HTTPD24_VERSION} extlib/$(OS_ARCH)_$(OS_MARCH)/apache24 + -$(CP) apr-${APR_VERSION} extlib/$(OS_ARCH)_$(OS_MARCH)/apache24/srclib/apr + -$(CP) apr-util-${APR_UTIL_VERSION} extlib/$(OS_ARCH)_$(OS_MARCH)/apache24/srclib/apr-util + -$(RMALL) httpd-* apr-* + -$(CD) extlib/$(OS_ARCH)_$(OS_MARCH)/apache24; ./configure --with-included-apr +apache22-src: apr + -$(WGET) https://archive.apache.org/dist/httpd/httpd-${HTTPD22_VERSION}.tar.bz2 + -$(UBZIP) httpd-${HTTPD22_VERSION}.tar.bz2; $(UTAR) httpd-${HTTPD22_VERSION}.tar + -$(MKDIR) extlib/$(OS_ARCH)_$(OS_MARCH) + -$(CP) httpd-${HTTPD22_VERSION} extlib/$(OS_ARCH)_$(OS_MARCH)/apache22 + -$(CP) apr-${APR_VERSION} extlib/$(OS_ARCH)_$(OS_MARCH)/apache22/srclib/apr + -$(CP) apr-util-${APR_UTIL_VERSION} extlib/$(OS_ARCH)_$(OS_MARCH)/apache22/srclib/apr-util + -$(RMALL) httpd-* apr-* + -$(CD) extlib/$(OS_ARCH)_$(OS_MARCH)/apache22; ./configure --with-included-apr apachezip: CFLAGS += $(COMPILEFLAG)DSERVER_VERSION='"2.4.x"' apachezip: CONTAINER = $(strip Apache 2.4 $(OS_ARCH)$(OS_ARCH_EXT) $(subst _,,$(OS_BITS))) -apachezip: clean build version apache agentadmin +apachezip: clean build version apache-src apache agentadmin @$(ECHO) "[***** Building Apache 2.4 agent archive *****]" -$(MKDIR) $(OBJDIR)$(PS)web_agents -$(MKDIR) $(OBJDIR)$(PS)web_agents$(PS)apache24_agent @@ -223,7 +266,7 @@ apache22_post: apache22zip: CFLAGS += $(COMPILEFLAG)DSERVER_VERSION='"2.2.x"' apache22zip: CONTAINER = $(strip Apache 2.2 $(OS_ARCH)$(OS_ARCH_EXT) $(subst _,,$(OS_BITS))) -apache22zip: clean build version apache22 agentadmin +apache22zip: clean build version apache22-src apache22 agentadmin @$(ECHO) "[***** Building Apache 2.2 agent archive *****]" -$(MKDIR) $(OBJDIR)$(PS)web_agents -$(MKDIR) $(OBJDIR)$(PS)web_agents$(PS)apache22_agent diff --git a/Makefile.linux.mk b/Makefile.linux.mk index b4bcf4a8c..349c256f4 100644 --- a/Makefile.linux.mk +++ b/Makefile.linux.mk @@ -22,7 +22,7 @@ SHARED := -shared CFLAGS += -fPIC -pthread -std=gnu99 -D_REENTRANT -DLINUX -D_GNU_SOURCE -D_FORTIFY_SOURCE=2 -fstack-protector-all \ -Wno-unused-value -Wno-deprecated-declarations - + ifdef DEBUG CFLAGS += -g3 -fno-inline -O0 -DDEBUG -Wall else @@ -37,6 +37,8 @@ else LDFLAGS += -m32 endif +CFLAGS += $(COMPILEFLAG)Iextlib/$(OS_ARCH)_$(OS_MARCH)/apache24/os/unix $(COMPILEFLAG)Iextlib/$(OS_ARCH)_$(OS_MARCH)/apache22/os/unix + LDFLAGS += -Wl,-rpath,'$$ORIGIN/../lib' -Wl,-rpath,'$$ORIGIN' -Wl,--no-as-needed -Wl,-z,now -Wl,-z,relro -lpthread -lresolv -lrt -ldl libopenam: $(OUT_OBJS) diff --git a/README.md b/README.md index db0032730..bb56bf145 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,6 @@ This project is licensed under the [Common Development and Distribution License sudo apt-get install -qq -y libpcre3-dev libbz2-dev git clone --recursive https://github.com/OpenIdentityPlatform/OpenAM-Web-Agents.git cd OpenAM-Web-Agents -./prepare-apache.sh make apache22zip && ls build/*.zip make apachezip && ls build/*.zip ``` diff --git a/prepare-apache.sh b/prepare-apache.sh deleted file mode 100755 index 1216f20ae..000000000 --- a/prepare-apache.sh +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/sh - -#Thanks https://gist.github.com/FireBurn/00bff4931a53e4380575707ac0f20fc8 - -BASE_DIR=`pwd` - -HTTPD24_VERSION=2.4.33 -HTTPD22_VERSION=2.2.34 -APR_VERSION=1.6.3 -APR_UTIL_VERSION=1.6.1 - -#clean - -rm -rf apr-* -rm -rf httpd-* - -# Download source files - -wget http://mirrors.ukfast.co.uk/sites/ftp.apache.org/httpd/httpd-${HTTPD24_VERSION}.tar.bz2 -wget https://archive.apache.org/dist/httpd/httpd-${HTTPD22_VERSION}.tar.bz2 -wget http://mirrors.ukfast.co.uk/sites/ftp.apache.org/apr/apr-${APR_VERSION}.tar.bz2 -wget http://mirrors.ukfast.co.uk/sites/ftp.apache.org/apr/apr-util-${APR_UTIL_VERSION}.tar.bz2 - -# Extract the code and move apr and apr-util into place - -tar xvfj httpd-${HTTPD24_VERSION}.tar.bz2 -tar xvfj httpd-${HTTPD22_VERSION}.tar.bz2 -tar xvfj apr-${APR_VERSION}.tar.bz2 -C httpd-${HTTPD24_VERSION}/srclib/ -tar xvfj apr-${APR_VERSION}.tar.bz2 -C httpd-${HTTPD22_VERSION}/srclib/ -tar xvfj apr-util-${APR_UTIL_VERSION}.tar.bz2 -C httpd-${HTTPD24_VERSION}/srclib/ -tar xvfj apr-util-${APR_UTIL_VERSION}.tar.bz2 -C httpd-${HTTPD22_VERSION}/srclib/ - -mv httpd-${HTTPD24_VERSION}/srclib/apr-${APR_VERSION}/ httpd-${HTTPD24_VERSION}/srclib/apr/ -mv httpd-${HTTPD22_VERSION}/srclib/apr-${APR_VERSION}/ httpd-${HTTPD22_VERSION}/srclib/apr/ -mv httpd-${HTTPD24_VERSION}/srclib/apr-util-${APR_UTIL_VERSION}/ httpd-${HTTPD24_VERSION}/srclib/apr-util/ -mv httpd-${HTTPD22_VERSION}/srclib/apr-util-${APR_UTIL_VERSION}/ httpd-${HTTPD22_VERSION}/srclib/apr-util/ - -# Configure HTTPD with APR and APR Util - -echo "configure apache24----------------------------" -cd ${BASE_DIR}/httpd-${HTTPD24_VERSION} -./configure --with-included-apr - -echo "configure apache24 ---------------------------" -cd ${BASE_DIR}/httpd-${HTTPD22_VERSION} -./configure --with-included-apr - -cd ${BASE_DIR} - -# These fix up the includes with our new apache and apr builds -sed -i 's#Iextlib/$(OS_ARCH)_$(OS_MARCH)/apache24/include#I'"${BASE_DIR}"'/httpd-'"${HTTPD24_VERSION}"'/include $(COMPILEFLAG)I'"${BASE_DIR}"'/httpd-'"${HTTPD24_VERSION}"'/srclib/apr/include $(COMPILEFLAG)I'"${BASE_DIR}"'/httpd-'"${HTTPD24_VERSION}"'/srclib/apr-util/include $(COMPILEFLAG)I'"${BASE_DIR}"'/httpd-'"${HTTPD24_VERSION}"'/os/unix#g' Makefile -sed -i 's#Iextlib/$(OS_ARCH)_$(OS_MARCH)/apache22/include#I'"${BASE_DIR}"'/httpd-'"${HTTPD22_VERSION}"'/include $(COMPILEFLAG)I'"${BASE_DIR}"'/httpd-'"${HTTPD22_VERSION}"'/srclib/apr/include $(COMPILEFLAG)I'"${BASE_DIR}"'/httpd-'"${HTTPD22_VERSION}"'/srclib/apr-util/include $(COMPILEFLAG)I'"${BASE_DIR}"'/httpd-'"${HTTPD22_VERSION}"'/os/unix#g' Makefile From 3c8d16cfc30ba542e835b052975a81617e709782 Mon Sep 17 00:00:00 2001 From: vharseko Date: Fri, 6 Jul 2018 10:54:13 +0300 Subject: [PATCH 002/212] remove install: - ./prepare-apache.sh from travis --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index bfa6dd5b6..4f7c4e53b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -69,9 +69,6 @@ before_install: - env | sort - git log `git describe --tags --abbrev=0 HEAD^ --always`..HEAD --oneline -install: - - ./prepare-apache.sh - script: - sed -i 's#4\.1\.0#'"${git_version}"'#g' Makefile - make apache22zip && mv build/*.zip . From 78feb64e692bbd4ebec7d2e31882bee0f15b2c47 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Fri, 6 Jul 2018 13:25:07 +0300 Subject: [PATCH 003/212] replace empty ifdef --- Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 484309909..0b9726781 100644 --- a/Makefile +++ b/Makefile @@ -23,9 +23,7 @@ HTTPD22_VERSION=2.2.34 APR_VERSION=1.6.3 APR_UTIL_VERSION=1.6.1 -ifdef 32 - -else +ifndef 32 64=1 endif From 505d42b4b19003c5e8fc9d6629668463281905ea Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Fri, 6 Jul 2018 13:30:50 +0300 Subject: [PATCH 004/212] kefile(27) : fatal error U1034: syntax error : separator missing --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 0b9726781..7dfb0ba21 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ APR_VERSION=1.6.3 APR_UTIL_VERSION=1.6.1 ifndef 32 - 64=1 + 64 := 1 endif # DEBUG=1 From 29a451b7d1fee4235167857ab1a98d3dc605b4a6 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Fri, 6 Jul 2018 17:03:32 +0300 Subject: [PATCH 005/212] test remove ifndef --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 7dfb0ba21..4e2dadf73 100644 --- a/Makefile +++ b/Makefile @@ -23,9 +23,9 @@ HTTPD22_VERSION=2.2.34 APR_VERSION=1.6.3 APR_UTIL_VERSION=1.6.1 -ifndef 32 - 64 := 1 -endif +#ifndef 32 +64 := 1 +#endif # DEBUG=1 From 17d30c7c2eb7e5f32daca426a48620634d86c138 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Fri, 6 Jul 2018 20:11:46 +0300 Subject: [PATCH 006/212] syntax error near unexpected token `(' --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 7d82faabc..44cb6146e 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -38,7 +38,7 @@ $(IIS_OUT_OBJS): COMPILEOPTS += /TP $(TEST_OBJECTS): CFLAGS += /D HAVE_MSVC_THREAD_LOCAL_STORAGE /D HAVE__SNPRINTF_S /D HAVE__VSNPRINTF_S /D UNIT_TESTING_DEBUG=1 ifneq ($(findstring $(MAKECMDGOALS), iis32 iis64 iiszip),) -LIB64ENV := $(shell echo $(LIBPATH) | findstr amd64) +LIB64ENV := $(shell echo "$(LIBPATH)" | findstr amd64) ifeq (,$(LIB64ENV)) $(error Missing support for 64 build environment) From 84a090130a4bebc1da7811e2f56b2a3c228eaa18 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Sun, 8 Jul 2018 23:31:08 +0300 Subject: [PATCH 007/212] syntax error near unexpected token `(' --- Makefile.windows.mk | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 44cb6146e..d4ffada9f 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -17,11 +17,11 @@ ifndef WINDOWS_MK_INCLUDED WINDOWS_MK_INCLUDED := true -CC32 := $(shell powershell 'Get-Command cl.exe | Where-Object {$$_.Definition -ne "" -and $$_.Definition -notlike "*amd64*"} | Select-Object -ExpandProperty Definition') +CC32 := "$(shell powershell 'Get-Command cl.exe | Where-Object {$$_.Definition -ne "" -and $$_.Definition -notlike "*amd64*"} | Select-Object -ExpandProperty Definition')" CC = cl -LINK32 := $(shell powershell 'Get-Command link.exe | Where-Object {$$_.Definition -ne "" -and $$_.Definition -notlike "*amd64*"} | Select-Object -ExpandProperty Definition') -LIB32_VC := $(shell powershell 'Get-Command link.exe | Where-Object {$$_.Definition -ne "" -and $$_.Definition -notlike "*amd64*"} | Select-Object -ExpandProperty Definition | split-path -parent | split-path -parent') -LIB32_SDK := $(shell powershell 'Get-ChildItem "$(WindowsSdkDir)" -recurse | Where-Object {$$_.PSIsContainer -eq $$true -and $$_.Name -eq "um"} | Select-Object -Index 1 | Select-Object -Expand FullName') +LINK32 := "$(shell powershell 'Get-Command link.exe | Where-Object {$$_.Definition -ne "" -and $$_.Definition -notlike "*amd64*"} | Select-Object -ExpandProperty Definition')" +LIB32_VC := "$(shell powershell 'Get-Command link.exe | Where-Object {$$_.Definition -ne "" -and $$_.Definition -notlike "*amd64*"} | Select-Object -ExpandProperty Definition | split-path -parent | split-path -parent')" +LIB32_SDK := "$(shell powershell 'Get-ChildItem "$(WindowsSdkDir)" -recurse | Where-Object {$$_.PSIsContainer -eq $$true -and $$_.Name -eq "um"} | Select-Object -Index 1 | Select-Object -Expand FullName')" LINK = link RC = rc SHARED = /DLL @@ -45,13 +45,13 @@ $(error Missing support for 64 build environment) endif ifeq (,$(CC32)) -CC32 := $(shell powershell 'Get-Command cl.exe | Where-Object {$$_.Definition -like "*amd64*"} | Select-Object -ExpandProperty Definition | split-path -parent | split-path -parent')\cl.exe +CC32 := "$(shell powershell 'Get-Command cl.exe | Where-Object {$$_.Definition -like "*amd64*"} | Select-Object -ExpandProperty Definition | split-path -parent | split-path -parent')\cl.exe" endif ifeq (,$(LINK32)) -LINK32 := $(shell powershell 'Get-Command cl.exe | Where-Object {$$_.Definition -like "*amd64*"} | Select-Object -ExpandProperty Definition | split-path -parent | split-path -parent')\link.exe +LINK32 := "$(shell powershell 'Get-Command cl.exe | Where-Object {$$_.Definition -like "*amd64*"} | Select-Object -ExpandProperty Definition | split-path -parent | split-path -parent')\link.exe" endif ifeq (,$(LIB32_VC)) -LIB32_VC := $(shell powershell 'Get-Command cl.exe | Where-Object {$$_.Definition -like "*amd64*"} | Select-Object -ExpandProperty Definition | split-path -parent | split-path -parent | split-path -parent') +LIB32_VC := "$(shell powershell 'Get-Command cl.exe | Where-Object {$$_.Definition -like "*amd64*"} | Select-Object -ExpandProperty Definition | split-path -parent | split-path -parent | split-path -parent')" endif else From 1c6d89fcbf2cbd7bdc46000cc9dcc2cd496437c5 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Sun, 8 Jul 2018 23:33:16 +0300 Subject: [PATCH 008/212] Revert "syntax error near unexpected token `('" This reverts commit 84a090130a4bebc1da7811e2f56b2a3c228eaa18. --- Makefile.windows.mk | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index d4ffada9f..44cb6146e 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -17,11 +17,11 @@ ifndef WINDOWS_MK_INCLUDED WINDOWS_MK_INCLUDED := true -CC32 := "$(shell powershell 'Get-Command cl.exe | Where-Object {$$_.Definition -ne "" -and $$_.Definition -notlike "*amd64*"} | Select-Object -ExpandProperty Definition')" +CC32 := $(shell powershell 'Get-Command cl.exe | Where-Object {$$_.Definition -ne "" -and $$_.Definition -notlike "*amd64*"} | Select-Object -ExpandProperty Definition') CC = cl -LINK32 := "$(shell powershell 'Get-Command link.exe | Where-Object {$$_.Definition -ne "" -and $$_.Definition -notlike "*amd64*"} | Select-Object -ExpandProperty Definition')" -LIB32_VC := "$(shell powershell 'Get-Command link.exe | Where-Object {$$_.Definition -ne "" -and $$_.Definition -notlike "*amd64*"} | Select-Object -ExpandProperty Definition | split-path -parent | split-path -parent')" -LIB32_SDK := "$(shell powershell 'Get-ChildItem "$(WindowsSdkDir)" -recurse | Where-Object {$$_.PSIsContainer -eq $$true -and $$_.Name -eq "um"} | Select-Object -Index 1 | Select-Object -Expand FullName')" +LINK32 := $(shell powershell 'Get-Command link.exe | Where-Object {$$_.Definition -ne "" -and $$_.Definition -notlike "*amd64*"} | Select-Object -ExpandProperty Definition') +LIB32_VC := $(shell powershell 'Get-Command link.exe | Where-Object {$$_.Definition -ne "" -and $$_.Definition -notlike "*amd64*"} | Select-Object -ExpandProperty Definition | split-path -parent | split-path -parent') +LIB32_SDK := $(shell powershell 'Get-ChildItem "$(WindowsSdkDir)" -recurse | Where-Object {$$_.PSIsContainer -eq $$true -and $$_.Name -eq "um"} | Select-Object -Index 1 | Select-Object -Expand FullName') LINK = link RC = rc SHARED = /DLL @@ -45,13 +45,13 @@ $(error Missing support for 64 build environment) endif ifeq (,$(CC32)) -CC32 := "$(shell powershell 'Get-Command cl.exe | Where-Object {$$_.Definition -like "*amd64*"} | Select-Object -ExpandProperty Definition | split-path -parent | split-path -parent')\cl.exe" +CC32 := $(shell powershell 'Get-Command cl.exe | Where-Object {$$_.Definition -like "*amd64*"} | Select-Object -ExpandProperty Definition | split-path -parent | split-path -parent')\cl.exe endif ifeq (,$(LINK32)) -LINK32 := "$(shell powershell 'Get-Command cl.exe | Where-Object {$$_.Definition -like "*amd64*"} | Select-Object -ExpandProperty Definition | split-path -parent | split-path -parent')\link.exe" +LINK32 := $(shell powershell 'Get-Command cl.exe | Where-Object {$$_.Definition -like "*amd64*"} | Select-Object -ExpandProperty Definition | split-path -parent | split-path -parent')\link.exe endif ifeq (,$(LIB32_VC)) -LIB32_VC := "$(shell powershell 'Get-Command cl.exe | Where-Object {$$_.Definition -like "*amd64*"} | Select-Object -ExpandProperty Definition | split-path -parent | split-path -parent | split-path -parent')" +LIB32_VC := $(shell powershell 'Get-Command cl.exe | Where-Object {$$_.Definition -like "*amd64*"} | Select-Object -ExpandProperty Definition | split-path -parent | split-path -parent | split-path -parent') endif else From 64a4eaaa1130cce9d335248f368007a397e48c03 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Sun, 8 Jul 2018 23:35:14 +0300 Subject: [PATCH 009/212] Compiling quote path --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 44cb6146e..edfd98c10 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -127,7 +127,7 @@ iis32: $(OUT_OBJS) $(IIS_OUT_OBJS) $(OBJDIR)/64/%.$(OBJ): %.c @$(ECHO) "[*** Compiling "$<" ***]" - $(CC) $(CFLAGS) $< $(COMPILEOPTS) + "$(CC)" $(CFLAGS) $< $(COMPILEOPTS) OUT_OBJS_64 := $(addprefix $(OBJDIR)/64/,$(SOURCES:.c=.$(OBJ))) IIS_OUT_OBJS_64 := $(addprefix $(OBJDIR)/64/,$(IIS_SOURCES:.c=.$(OBJ))) From 6e43083b4327d6597e914932faee965429172b47 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Sun, 8 Jul 2018 23:41:39 +0300 Subject: [PATCH 010/212] SHELL=C:\Windows\system32\cmd.exe --- Makefile.windows.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index edfd98c10..20dc4e4f0 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -13,6 +13,7 @@ # # Copyright 2014 - 2016 ForgeRock AS. # +SHELL=C:\Windows\system32\cmd.exe ifndef WINDOWS_MK_INCLUDED WINDOWS_MK_INCLUDED := true @@ -127,7 +128,7 @@ iis32: $(OUT_OBJS) $(IIS_OUT_OBJS) $(OBJDIR)/64/%.$(OBJ): %.c @$(ECHO) "[*** Compiling "$<" ***]" - "$(CC)" $(CFLAGS) $< $(COMPILEOPTS) + $(CC) $(CFLAGS) $< $(COMPILEOPTS) OUT_OBJS_64 := $(addprefix $(OBJDIR)/64/,$(SOURCES:.c=.$(OBJ))) IIS_OUT_OBJS_64 := $(addprefix $(OBJDIR)/64/,$(IIS_SOURCES:.c=.$(OBJ))) From 44af807a545fbfbff0bb2038bbf2b89d827370ae Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Sun, 8 Jul 2018 23:44:33 +0300 Subject: [PATCH 011/212] Revert "SHELL=C:\Windows\system32\cmd.exe" This reverts commit 6e43083b4327d6597e914932faee965429172b47. --- Makefile.windows.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 20dc4e4f0..edfd98c10 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -13,7 +13,6 @@ # # Copyright 2014 - 2016 ForgeRock AS. # -SHELL=C:\Windows\system32\cmd.exe ifndef WINDOWS_MK_INCLUDED WINDOWS_MK_INCLUDED := true @@ -128,7 +127,7 @@ iis32: $(OUT_OBJS) $(IIS_OUT_OBJS) $(OBJDIR)/64/%.$(OBJ): %.c @$(ECHO) "[*** Compiling "$<" ***]" - $(CC) $(CFLAGS) $< $(COMPILEOPTS) + "$(CC)" $(CFLAGS) $< $(COMPILEOPTS) OUT_OBJS_64 := $(addprefix $(OBJDIR)/64/,$(SOURCES:.c=.$(OBJ))) IIS_OUT_OBJS_64 := $(addprefix $(OBJDIR)/64/,$(IIS_SOURCES:.c=.$(OBJ))) From 267324b09a7f6da6478d99bce39bed00a8df6ed7 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Sun, 8 Jul 2018 23:49:08 +0300 Subject: [PATCH 012/212] move SHELL=C:\Windows\system32\cmd.exe --- Makefile.windows.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index edfd98c10..1913ea086 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -127,7 +127,8 @@ iis32: $(OUT_OBJS) $(IIS_OUT_OBJS) $(OBJDIR)/64/%.$(OBJ): %.c @$(ECHO) "[*** Compiling "$<" ***]" - "$(CC)" $(CFLAGS) $< $(COMPILEOPTS) + SHELL=C:\Windows\system32\cmd.exe + $(CC) $(CFLAGS) $< $(COMPILEOPTS) OUT_OBJS_64 := $(addprefix $(OBJDIR)/64/,$(SOURCES:.c=.$(OBJ))) IIS_OUT_OBJS_64 := $(addprefix $(OBJDIR)/64/,$(IIS_SOURCES:.c=.$(OBJ))) From 733638cbef4191ba5a70e67bc41aeaa09a8b3005 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Sun, 8 Jul 2018 23:52:36 +0300 Subject: [PATCH 013/212] $(shell powershell ' --- Makefile.windows.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 1913ea086..fbbbb7663 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -127,8 +127,7 @@ iis32: $(OUT_OBJS) $(IIS_OUT_OBJS) $(OBJDIR)/64/%.$(OBJ): %.c @$(ECHO) "[*** Compiling "$<" ***]" - SHELL=C:\Windows\system32\cmd.exe - $(CC) $(CFLAGS) $< $(COMPILEOPTS) + $(shell powershell '$(CC) $(CFLAGS) $< $(COMPILEOPTS)') OUT_OBJS_64 := $(addprefix $(OBJDIR)/64/,$(SOURCES:.c=.$(OBJ))) IIS_OUT_OBJS_64 := $(addprefix $(OBJDIR)/64/,$(IIS_SOURCES:.c=.$(OBJ))) From 3776138c7e8011178f256cf1c80055877db41de6 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Sun, 8 Jul 2018 23:57:55 +0300 Subject: [PATCH 014/212] SHELL := /bin/bash --- Makefile.windows.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index fbbbb7663..cf57ebe11 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -13,6 +13,7 @@ # # Copyright 2014 - 2016 ForgeRock AS. # +SHELL := /bin/bash ifndef WINDOWS_MK_INCLUDED WINDOWS_MK_INCLUDED := true @@ -127,7 +128,7 @@ iis32: $(OUT_OBJS) $(IIS_OUT_OBJS) $(OBJDIR)/64/%.$(OBJ): %.c @$(ECHO) "[*** Compiling "$<" ***]" - $(shell powershell '$(CC) $(CFLAGS) $< $(COMPILEOPTS)') + $(CC) $(CFLAGS) $< $(COMPILEOPTS) OUT_OBJS_64 := $(addprefix $(OBJDIR)/64/,$(SOURCES:.c=.$(OBJ))) IIS_OUT_OBJS_64 := $(addprefix $(OBJDIR)/64/,$(IIS_SOURCES:.c=.$(OBJ))) From c219e928a406f5e9696a69ba9c172bc4501886c4 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Mon, 9 Jul 2018 00:06:24 +0300 Subject: [PATCH 015/212] cmd /c cl.exe --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index cf57ebe11..1c0f7e07e 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -18,7 +18,7 @@ SHELL := /bin/bash ifndef WINDOWS_MK_INCLUDED WINDOWS_MK_INCLUDED := true -CC32 := $(shell powershell 'Get-Command cl.exe | Where-Object {$$_.Definition -ne "" -and $$_.Definition -notlike "*amd64*"} | Select-Object -ExpandProperty Definition') +CC32 := cmd /c $(shell powershell 'Get-Command cl.exe | Where-Object {$$_.Definition -ne "" -and $$_.Definition -notlike "*amd64*"} | Select-Object -ExpandProperty Definition') CC = cl LINK32 := $(shell powershell 'Get-Command link.exe | Where-Object {$$_.Definition -ne "" -and $$_.Definition -notlike "*amd64*"} | Select-Object -ExpandProperty Definition') LIB32_VC := $(shell powershell 'Get-Command link.exe | Where-Object {$$_.Definition -ne "" -and $$_.Definition -notlike "*amd64*"} | Select-Object -ExpandProperty Definition | split-path -parent | split-path -parent') From ef6a95f41a1c0d631c9b2a65fdefb43423dcb792 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Mon, 9 Jul 2018 00:09:05 +0300 Subject: [PATCH 016/212] CC32 :=cmd /c $(CC32) --- Makefile.windows.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 1c0f7e07e..9ca2fbbbd 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -18,7 +18,7 @@ SHELL := /bin/bash ifndef WINDOWS_MK_INCLUDED WINDOWS_MK_INCLUDED := true -CC32 := cmd /c $(shell powershell 'Get-Command cl.exe | Where-Object {$$_.Definition -ne "" -and $$_.Definition -notlike "*amd64*"} | Select-Object -ExpandProperty Definition') +CC32 := $(shell powershell 'Get-Command cl.exe | Where-Object {$$_.Definition -ne "" -and $$_.Definition -notlike "*amd64*"} | Select-Object -ExpandProperty Definition') CC = cl LINK32 := $(shell powershell 'Get-Command link.exe | Where-Object {$$_.Definition -ne "" -and $$_.Definition -notlike "*amd64*"} | Select-Object -ExpandProperty Definition') LIB32_VC := $(shell powershell 'Get-Command link.exe | Where-Object {$$_.Definition -ne "" -and $$_.Definition -notlike "*amd64*"} | Select-Object -ExpandProperty Definition | split-path -parent | split-path -parent') @@ -70,6 +70,8 @@ ifdef DEBUG else CFLAGS += /MT endif + +CC32 :=cmd /c $(CC32) libopenam: $(OUT_OBJS) @$(ECHO) "[*** Creating "$@" shared library ***]" From cafbc1f134fd35aee0bae77c75e3884480ce1df9 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Mon, 9 Jul 2018 00:11:52 +0300 Subject: [PATCH 017/212] CC32 :="$(CC32)" --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 9ca2fbbbd..bfbd1959a 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -71,7 +71,7 @@ else CFLAGS += /MT endif -CC32 :=cmd /c $(CC32) +CC32 :="$(CC32)" libopenam: $(OUT_OBJS) @$(ECHO) "[*** Creating "$@" shared library ***]" From f8686faac6a5d211914019e7e804d38d11f841ba Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Mon, 9 Jul 2018 00:14:56 +0300 Subject: [PATCH 018/212] CC32 :=cl.exe --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index bfbd1959a..08a935d4a 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -71,7 +71,7 @@ else CFLAGS += /MT endif -CC32 :="$(CC32)" +CC32 :=cl.exe libopenam: $(OUT_OBJS) @$(ECHO) "[*** Creating "$@" shared library ***]" From e6ceaf456507cab7b04414d3202f9f7b7696ac0f Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Mon, 9 Jul 2018 00:27:58 +0300 Subject: [PATCH 019/212] off error Missing support for 64 build environment --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 08a935d4a..76685d3c3 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -42,7 +42,7 @@ ifneq ($(findstring $(MAKECMDGOALS), iis32 iis64 iiszip),) LIB64ENV := $(shell echo "$(LIBPATH)" | findstr amd64) ifeq (,$(LIB64ENV)) -$(error Missing support for 64 build environment) +#$(error Missing support for 64 build environment) endif ifeq (,$(CC32)) From e0e6b6f3736f59d710b00e643c861a892ce96638 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Mon, 9 Jul 2018 16:57:22 +0300 Subject: [PATCH 020/212] type source\version.h --- Makefile.windows.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 76685d3c3..23909a77c 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -121,6 +121,8 @@ iis32: $(OUT_OBJS) $(IIS_OUT_OBJS) -$(RMALL) $(OBJDIR)$(PS)version.* $(SED) -e "s$(SUB)_FILE_NAME_$(SUB)mod_iis_openam_32.dll$(SUB)g" \ -e "s$(SUB)_FILE_TYPE_$(SUB)VFT_DLL$(SUB)g" < source$(PS)version.rc.template > $(OBJDIR)$(PS)version.rc + type source\version.h + type $(OBJDIR)$(PS)version.rc $(RC) /l 0x0409 /nologo /fo $(OBJDIR)$(PS)version.res $(OBJDIR)$(PS)version.rc "${LINK32}" $(SHARED) /LIBPATH:"$(LIB32_SDK)\x86" /LIBPATH:"$(LIB32_VC)\LIB" $(LDFLAGS) $(OUT_OBJS) $(IIS_OUT_OBJS) \ $(OBJDIR)$(PS)version.res /OUT:build\mod_iis_openam_32.dll \ From 8f11a399f51aa84acdbffb6102ce7e991c55fb3f Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Mon, 9 Jul 2018 17:01:39 +0300 Subject: [PATCH 021/212] iis: version --- Makefile.windows.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 23909a77c..6249515c5 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -104,7 +104,7 @@ apache22: apache22_pre $(OUT_OBJS) $(APACHE22_OUT_OBJS) apache22_post extlib/$(OS_ARCH)$(OS_MARCH)/apache22/lib/libapr-1.lib extlib/$(OS_ARCH)$(OS_MARCH)/apache22/lib/libaprutil-1.lib \ extlib/$(OS_ARCH)$(OS_MARCH)/apache22/lib/libhttpd.lib -iis: iis32 agentadmin_iis iisclean iis64 +iis: version iis32 agentadmin_iis iisclean iis64 iisclean: -$(RMALL) $(OBJDIR)$(PS)* @@ -121,7 +121,7 @@ iis32: $(OUT_OBJS) $(IIS_OUT_OBJS) -$(RMALL) $(OBJDIR)$(PS)version.* $(SED) -e "s$(SUB)_FILE_NAME_$(SUB)mod_iis_openam_32.dll$(SUB)g" \ -e "s$(SUB)_FILE_TYPE_$(SUB)VFT_DLL$(SUB)g" < source$(PS)version.rc.template > $(OBJDIR)$(PS)version.rc - type source\version.h + type source\\version.h type $(OBJDIR)$(PS)version.rc $(RC) /l 0x0409 /nologo /fo $(OBJDIR)$(PS)version.res $(OBJDIR)$(PS)version.rc "${LINK32}" $(SHARED) /LIBPATH:"$(LIB32_SDK)\x86" /LIBPATH:"$(LIB32_VC)\LIB" $(LDFLAGS) $(OUT_OBJS) $(IIS_OUT_OBJS) \ From 0737488879ac9ef2ad20cb9c7ae5599364b5a313 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Mon, 9 Jul 2018 17:09:17 +0300 Subject: [PATCH 022/212] cat version.h after generate --- Makefile | 4 +++- Makefile.windows.mk | 2 -- source/version.template | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 4e2dadf73..921721508 100644 --- a/Makefile +++ b/Makefile @@ -40,6 +40,7 @@ ifneq ("$(PROGRAMFILES)$(ProgramFiles)","") MKDIR := cmd /c mkdir CP := cmd /c copy /E /Y CD := cd + CAT :=type EXEC := REVISION := Revision: $(shell git rev-parse --short HEAD) BUILD_MACHINE := $(shell hostname) @@ -74,6 +75,7 @@ else UTAR=tar xf UBZIP=bunzip2 WGET=wget + CAT=cat endif SED_ROPT := r @@ -197,7 +199,7 @@ version: -e "s$(SUB)_VERSION_NUM_$(SUB)$(VERSION_NUM)$(SUB)g" \ -e "s$(SUB)_CONTAINER_$(SUB)$(CONTAINER)$(SUB)g" \ -e "s$(SUB)_VERSION_$(SUB)$(VERSION)$(SUB)g" < source$(PS)version.template > source$(PS)version.h - + $(CAT) source$(PS)version.h clean: -$(RMDIR) $(OBJDIR) -$(RMALL) source$(PS)version.h diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 6249515c5..a0ec9913b 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -121,8 +121,6 @@ iis32: $(OUT_OBJS) $(IIS_OUT_OBJS) -$(RMALL) $(OBJDIR)$(PS)version.* $(SED) -e "s$(SUB)_FILE_NAME_$(SUB)mod_iis_openam_32.dll$(SUB)g" \ -e "s$(SUB)_FILE_TYPE_$(SUB)VFT_DLL$(SUB)g" < source$(PS)version.rc.template > $(OBJDIR)$(PS)version.rc - type source\\version.h - type $(OBJDIR)$(PS)version.rc $(RC) /l 0x0409 /nologo /fo $(OBJDIR)$(PS)version.res $(OBJDIR)$(PS)version.rc "${LINK32}" $(SHARED) /LIBPATH:"$(LIB32_SDK)\x86" /LIBPATH:"$(LIB32_VC)\LIB" $(LDFLAGS) $(OUT_OBJS) $(IIS_OUT_OBJS) \ $(OBJDIR)$(PS)version.res /OUT:build\mod_iis_openam_32.dll \ diff --git a/source/version.template b/source/version.template index c220d230c..8a2075907 100644 --- a/source/version.template +++ b/source/version.template @@ -27,9 +27,9 @@ #define MODINFO DESCRIPTION"/"VERSION #ifdef __sun -#pragma ident "@(#)am.h _VERSION_ _IDENT_DATE_ ForgeRock AS" +#pragma ident "@(#)am.h _VERSION_ _IDENT_DATE_ Open Identity Platform Community" #else -static char const rcsid[] = "$Id: am.h _VERSION_ _IDENT_DATE_ ForgeRock AS Exp $"; +static char const rcsid[] = "$Id: am.h _VERSION_ _IDENT_DATE_ Identity Platform Community Exp $"; #endif #endif From 04ea6e4df2c38c4faf26e1d09975019f1e063e48 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Mon, 9 Jul 2018 17:13:01 +0300 Subject: [PATCH 023/212] remove cmd /c from sed --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 921721508..aca14a82e 100644 --- a/Makefile +++ b/Makefile @@ -35,7 +35,7 @@ ifneq ("$(PROGRAMFILES)$(ProgramFiles)","") OS_ARCH := WINNT RMALL := cmd /c del /F /Q RMDIR := cmd /c rmdir /S /Q - SED := cmd /c sed.exe + SED := sed.exe ECHO := cmd /c echo MKDIR := cmd /c mkdir CP := cmd /c copy /E /Y From 6e7278dedf04fd5639ff165fc4b561969c4edd34 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Mon, 9 Jul 2018 18:43:29 +0300 Subject: [PATCH 024/212] rollback remove cmd /c sed --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index aca14a82e..921721508 100644 --- a/Makefile +++ b/Makefile @@ -35,7 +35,7 @@ ifneq ("$(PROGRAMFILES)$(ProgramFiles)","") OS_ARCH := WINNT RMALL := cmd /c del /F /Q RMDIR := cmd /c rmdir /S /Q - SED := sed.exe + SED := cmd /c sed.exe ECHO := cmd /c echo MKDIR := cmd /c mkdir CP := cmd /c copy /E /Y From b88335ac97a9690a819d8c3b57019459b5af33ac Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Mon, 9 Jul 2018 18:51:19 +0300 Subject: [PATCH 025/212] car in version --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 921721508..6d72a7b80 100644 --- a/Makefile +++ b/Makefile @@ -193,12 +193,12 @@ build: version: @$(ECHO) "[***** Updating version.h *****]" -$(RMALL) source$(PS)version.h - $(SED) -e "s$(SUB)_REVISION_$(SUB)$(REVISION)$(SUB)g" \ + $(CAT) source$(PS)version.template | $(SED) -e "s$(SUB)_REVISION_$(SUB)$(REVISION)$(SUB)g" \ -e "s$(SUB)_IDENT_DATE_$(SUB)$(IDENT_DATE)$(SUB)g" \ -e "s$(SUB)_BUILD_MACHINE_$(SUB)$(BUILD_MACHINE)$(SUB)g" \ -e "s$(SUB)_VERSION_NUM_$(SUB)$(VERSION_NUM)$(SUB)g" \ -e "s$(SUB)_CONTAINER_$(SUB)$(CONTAINER)$(SUB)g" \ - -e "s$(SUB)_VERSION_$(SUB)$(VERSION)$(SUB)g" < source$(PS)version.template > source$(PS)version.h + -e "s$(SUB)_VERSION_$(SUB)$(VERSION)$(SUB)g" >> source$(PS)version.h $(CAT) source$(PS)version.h clean: -$(RMDIR) $(OBJDIR) From bed4d0c1b5be9bfd34af9bfcea03903292c9ed8e Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Mon, 9 Jul 2018 18:57:26 +0300 Subject: [PATCH 026/212] sed --- Makefile | 3 ++- source/version.template | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 6d72a7b80..8f9a2ba8f 100644 --- a/Makefile +++ b/Makefile @@ -35,7 +35,7 @@ ifneq ("$(PROGRAMFILES)$(ProgramFiles)","") OS_ARCH := WINNT RMALL := cmd /c del /F /Q RMDIR := cmd /c rmdir /S /Q - SED := cmd /c sed.exe + SED := sed.exe ECHO := cmd /c echo MKDIR := cmd /c mkdir CP := cmd /c copy /E /Y @@ -193,6 +193,7 @@ build: version: @$(ECHO) "[***** Updating version.h *****]" -$(RMALL) source$(PS)version.h + $(CAT) source$(PS)version.template $(CAT) source$(PS)version.template | $(SED) -e "s$(SUB)_REVISION_$(SUB)$(REVISION)$(SUB)g" \ -e "s$(SUB)_IDENT_DATE_$(SUB)$(IDENT_DATE)$(SUB)g" \ -e "s$(SUB)_BUILD_MACHINE_$(SUB)$(BUILD_MACHINE)$(SUB)g" \ diff --git a/source/version.template b/source/version.template index 8a2075907..4c683316d 100644 --- a/source/version.template +++ b/source/version.template @@ -29,7 +29,7 @@ #ifdef __sun #pragma ident "@(#)am.h _VERSION_ _IDENT_DATE_ Open Identity Platform Community" #else -static char const rcsid[] = "$Id: am.h _VERSION_ _IDENT_DATE_ Identity Platform Community Exp $"; +static char const rcsid[] = "$Id: am.h _VERSION_ _IDENT_DATE_ Open Identity Platform Community Exp $"; #endif #endif From 78da8eb4343b50cc90b790481b9e56b3c45a29dd Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Mon, 9 Jul 2018 19:00:51 +0300 Subject: [PATCH 027/212] test pwd --- Makefile | 2 ++ Makefile.windows.mk | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8f9a2ba8f..04b695e80 100644 --- a/Makefile +++ b/Makefile @@ -193,6 +193,8 @@ build: version: @$(ECHO) "[***** Updating version.h *****]" -$(RMALL) source$(PS)version.h + pwd + cmd /c $(CAT) source$(PS)version.template $(CAT) source$(PS)version.template $(CAT) source$(PS)version.template | $(SED) -e "s$(SUB)_REVISION_$(SUB)$(REVISION)$(SUB)g" \ -e "s$(SUB)_IDENT_DATE_$(SUB)$(IDENT_DATE)$(SUB)g" \ diff --git a/Makefile.windows.mk b/Makefile.windows.mk index a0ec9913b..4d3411a3d 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -13,7 +13,6 @@ # # Copyright 2014 - 2016 ForgeRock AS. # -SHELL := /bin/bash ifndef WINDOWS_MK_INCLUDED WINDOWS_MK_INCLUDED := true From a858fba1c65dd0c6913d7698ce99c62847754983 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Mon, 9 Jul 2018 19:20:59 +0300 Subject: [PATCH 028/212] type to cat --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 04b695e80..a8de9a79d 100644 --- a/Makefile +++ b/Makefile @@ -40,7 +40,7 @@ ifneq ("$(PROGRAMFILES)$(ProgramFiles)","") MKDIR := cmd /c mkdir CP := cmd /c copy /E /Y CD := cd - CAT :=type + CAT :=cat EXEC := REVISION := Revision: $(shell git rev-parse --short HEAD) BUILD_MACHINE := $(shell hostname) From dd4724361ac30e00cf27adfa3a0fe1b92a9c189d Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Mon, 9 Jul 2018 19:26:04 +0300 Subject: [PATCH 029/212] LINK32 :=link.exe --- Makefile.windows.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 4d3411a3d..1648ef0fa 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -71,6 +71,7 @@ else endif CC32 :=cl.exe +LINK32 :=link.exe libopenam: $(OUT_OBJS) @$(ECHO) "[*** Creating "$@" shared library ***]" From dd6969b8fb80851cc6bff040232c6236f8c9564b Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Mon, 9 Jul 2018 19:48:47 +0300 Subject: [PATCH 030/212] revert autodetect compiler path --- Makefile.windows.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 1648ef0fa..8c510c1df 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -70,8 +70,8 @@ else CFLAGS += /MT endif -CC32 :=cl.exe -LINK32 :=link.exe +dCC32 :=cl.exe +dLINK32 :=link.exe libopenam: $(OUT_OBJS) @$(ECHO) "[*** Creating "$@" shared library ***]" From 57c0efcee40799fb865ba1d2c2cbef22feda5904 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Mon, 9 Jul 2018 19:52:17 +0300 Subject: [PATCH 031/212] cmd /c cc --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 8c510c1df..6262b5658 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -70,7 +70,7 @@ else CFLAGS += /MT endif -dCC32 :=cl.exe +CC32 :=cmd /c "$(CC32)" dLINK32 :=link.exe libopenam: $(OUT_OBJS) From cb0f87f971f10c422ce363bad70885feba4f3c4d Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Mon, 9 Jul 2018 20:09:40 +0300 Subject: [PATCH 032/212] CC32 := $(cygpath -u "${CC32}") --- Makefile.windows.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 6262b5658..3ff41e48b 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -70,8 +70,8 @@ else CFLAGS += /MT endif -CC32 :=cmd /c "$(CC32)" -dLINK32 :=link.exe +CC32 := $(cygpath -u "${CC32}") +LINK32 :=$(cygpath -u "${LINK32}") libopenam: $(OUT_OBJS) @$(ECHO) "[*** Creating "$@" shared library ***]" From ef78383451f37e01e11e7b06aa197c53345aedd3 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Mon, 9 Jul 2018 20:13:05 +0300 Subject: [PATCH 033/212] replace {} () --- Makefile.windows.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 3ff41e48b..5cc21a192 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -70,8 +70,8 @@ else CFLAGS += /MT endif -CC32 := $(cygpath -u "${CC32}") -LINK32 :=$(cygpath -u "${LINK32}") +CC32 := $(cygpath -u "$(CC32)") +LINK32 :=$(cygpath -u "$(LINK32)") libopenam: $(OUT_OBJS) @$(ECHO) "[*** Creating "$@" shared library ***]" From b1d9db642abe64aee62962f81c33cf298893e747 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Mon, 9 Jul 2018 20:17:30 +0300 Subject: [PATCH 034/212] remove quote --- Makefile.windows.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 5cc21a192..bd9a97e36 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -70,8 +70,8 @@ else CFLAGS += /MT endif -CC32 := $(cygpath -u "$(CC32)") -LINK32 :=$(cygpath -u "$(LINK32)") +CC32 := $(cygpath -u $(CC32)) +LINK32 :=$(cygpath -u $(LINK32)) libopenam: $(OUT_OBJS) @$(ECHO) "[*** Creating "$@" shared library ***]" From 870684f87dc0f2483892f2e1eea23e6e9b167a4c Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Mon, 9 Jul 2018 20:23:10 +0300 Subject: [PATCH 035/212] add switch VS 2017 path env --- Makefile.windows.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index bd9a97e36..e3c40d6e8 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -58,9 +58,11 @@ else ifdef 64 LDFLAGS += /MACHINE:X64 OS_MARCH := _64 + call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat" else LDFLAGS += /MACHINE:X86 OS_MARCH := + call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars32.bat" endif endif @@ -70,8 +72,8 @@ else CFLAGS += /MT endif -CC32 := $(cygpath -u $(CC32)) -LINK32 :=$(cygpath -u $(LINK32)) +CC32 := cl +LINK32 :=link libopenam: $(OUT_OBJS) @$(ECHO) "[*** Creating "$@" shared library ***]" From a19baa5a117469e4414eaba3dcc6100606584c51 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Mon, 9 Jul 2018 20:24:14 +0300 Subject: [PATCH 036/212] remove call --- Makefile.windows.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index e3c40d6e8..dedfc36e6 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -58,11 +58,11 @@ else ifdef 64 LDFLAGS += /MACHINE:X64 OS_MARCH := _64 - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat" + "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat" else LDFLAGS += /MACHINE:X86 OS_MARCH := - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars32.bat" + "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars32.bat" endif endif From 5eb89d25d648222072653cc4446296f401225948 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Mon, 9 Jul 2018 22:39:44 +0300 Subject: [PATCH 037/212] debug path --- Makefile.windows.mk | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index dedfc36e6..69831de8f 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -58,22 +58,24 @@ else ifdef 64 LDFLAGS += /MACHINE:X64 OS_MARCH := _64 - "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat" else LDFLAGS += /MACHINE:X86 OS_MARCH := - "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars32.bat" endif endif + ifdef DEBUG CFLAGS += /MTd /D _DEBUG /D DEBUG else CFLAGS += /MT endif -CC32 := cl -LINK32 :=link +echo "$(CC)" +echo "$(CC32)" +echo "$(shell cygpath -u $(CC32))" +#CC32 := cl +#LINK32 :=link libopenam: $(OUT_OBJS) @$(ECHO) "[*** Creating "$@" shared library ***]" From a2e7c7f55237425ac43dc2c1a07376ae73c56e9d Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Mon, 9 Jul 2018 22:47:14 +0300 Subject: [PATCH 038/212] missing separator --- Makefile.windows.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 69831de8f..17aa1c593 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -71,12 +71,12 @@ else CFLAGS += /MT endif -echo "$(CC)" -echo "$(CC32)" -echo "$(shell cygpath -u $(CC32))" #CC32 := cl #LINK32 :=link - + echo "$(CC)" + echo "$(CC32)" + echo "$(shell cygpath -u $(CC32))" + libopenam: $(OUT_OBJS) @$(ECHO) "[*** Creating "$@" shared library ***]" -$(RMALL) $(OBJDIR)$(PS)version.* @@ -108,7 +108,7 @@ apache22: apache22_pre $(OUT_OBJS) $(APACHE22_OUT_OBJS) apache22_post extlib/$(OS_ARCH)$(OS_MARCH)/apache22/lib/libapr-1.lib extlib/$(OS_ARCH)$(OS_MARCH)/apache22/lib/libaprutil-1.lib \ extlib/$(OS_ARCH)$(OS_MARCH)/apache22/lib/libhttpd.lib -iis: version iis32 agentadmin_iis iisclean iis64 +iis: iis32 agentadmin_iis iisclean iis64 iisclean: -$(RMALL) $(OBJDIR)$(PS)* From 6eb2339a74f891864697f852d9b3b4c0f85d30a8 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Mon, 9 Jul 2018 22:50:06 +0300 Subject: [PATCH 039/212] recipe commences before first target --- Makefile.windows.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 17aa1c593..1f0e29045 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -73,9 +73,6 @@ endif #CC32 := cl #LINK32 :=link - echo "$(CC)" - echo "$(CC32)" - echo "$(shell cygpath -u $(CC32))" libopenam: $(OUT_OBJS) @$(ECHO) "[*** Creating "$@" shared library ***]" @@ -131,6 +128,9 @@ iis32: $(OUT_OBJS) $(IIS_OUT_OBJS) /PDB:build\mod_iis_openam_32.pdb $(LIBS) /EXPORT:RegisterModule oleaut32.lib $(CP) $(OBJDIR)$(PS)mod_iis_openam_32.dll $(OBJDIR)$(PS)dist $(CP) $(OBJDIR)$(PS)mod_iis_openam_32.pdb $(OBJDIR)$(PS)dist +echo "$(CC)" +echo "$(CC32)" +echo "$(shell cygpath -u $(CC32))" $(OBJDIR)/64/%.$(OBJ): %.c @$(ECHO) "[*** Compiling "$<" ***]" From ee7eb5fe14cfa8fa697263f9572b8b1202962a37 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Mon, 9 Jul 2018 22:54:15 +0300 Subject: [PATCH 040/212] remove echo --- Makefile.windows.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 1f0e29045..57a1824b5 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -128,9 +128,6 @@ iis32: $(OUT_OBJS) $(IIS_OUT_OBJS) /PDB:build\mod_iis_openam_32.pdb $(LIBS) /EXPORT:RegisterModule oleaut32.lib $(CP) $(OBJDIR)$(PS)mod_iis_openam_32.dll $(OBJDIR)$(PS)dist $(CP) $(OBJDIR)$(PS)mod_iis_openam_32.pdb $(OBJDIR)$(PS)dist -echo "$(CC)" -echo "$(CC32)" -echo "$(shell cygpath -u $(CC32))" $(OBJDIR)/64/%.$(OBJ): %.c @$(ECHO) "[*** Compiling "$<" ***]" From b2a341926ca97c7c4c71353211733eb536c1fb2c Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Mon, 9 Jul 2018 22:59:14 +0300 Subject: [PATCH 041/212] cmd /c compiler --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 57a1824b5..4e09b9157 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -131,7 +131,7 @@ iis32: $(OUT_OBJS) $(IIS_OUT_OBJS) $(OBJDIR)/64/%.$(OBJ): %.c @$(ECHO) "[*** Compiling "$<" ***]" - $(CC) $(CFLAGS) $< $(COMPILEOPTS) + cmd /c "$(CC) $(CFLAGS) $< $(COMPILEOPTS)" OUT_OBJS_64 := $(addprefix $(OBJDIR)/64/,$(SOURCES:.c=.$(OBJ))) IIS_OUT_OBJS_64 := $(addprefix $(OBJDIR)/64/,$(IIS_SOURCES:.c=.$(OBJ))) From a7184faea4f9cd07071bc0caaa3a19b4c5b92c1d Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Mon, 9 Jul 2018 23:03:51 +0300 Subject: [PATCH 042/212] CC:=cmd /c $(CC) --- Makefile.windows.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 4e09b9157..d8dbeef04 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -73,6 +73,7 @@ endif #CC32 := cl #LINK32 :=link +CC:=cmd /c $(CC) libopenam: $(OUT_OBJS) @$(ECHO) "[*** Creating "$@" shared library ***]" @@ -131,7 +132,7 @@ iis32: $(OUT_OBJS) $(IIS_OUT_OBJS) $(OBJDIR)/64/%.$(OBJ): %.c @$(ECHO) "[*** Compiling "$<" ***]" - cmd /c "$(CC) $(CFLAGS) $< $(COMPILEOPTS)" + $(CC) $(CFLAGS) $< $(COMPILEOPTS) OUT_OBJS_64 := $(addprefix $(OBJDIR)/64/,$(SOURCES:.c=.$(OBJ))) IIS_OUT_OBJS_64 := $(addprefix $(OBJDIR)/64/,$(IIS_SOURCES:.c=.$(OBJ))) From 6fa5d048df49b4a729ec5085a03e000278d3ad0c Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Mon, 9 Jul 2018 23:06:06 +0300 Subject: [PATCH 043/212] CC32:=cmd /c $(CC32) --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index d8dbeef04..172232725 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -73,7 +73,7 @@ endif #CC32 := cl #LINK32 :=link -CC:=cmd /c $(CC) +CC32:=cmd /c $(CC32) libopenam: $(OUT_OBJS) @$(ECHO) "[*** Creating "$@" shared library ***]" From 3657c60fd38e64dee019d958bef27a7fb950f913 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Mon, 9 Jul 2018 23:08:49 +0300 Subject: [PATCH 044/212] quote " --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 172232725..f793ef2d2 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -73,7 +73,7 @@ endif #CC32 := cl #LINK32 :=link -CC32:=cmd /c $(CC32) +CC32:="$(CC32)" libopenam: $(OUT_OBJS) @$(ECHO) "[*** Creating "$@" shared library ***]" From a1726e27402d3590b35e365961c53885cc8903a3 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Mon, 9 Jul 2018 23:17:29 +0300 Subject: [PATCH 045/212] CC32:=$(shell cygpath $(CC32)) --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index f793ef2d2..d3e71132f 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -73,7 +73,7 @@ endif #CC32 := cl #LINK32 :=link -CC32:="$(CC32)" +CC32:=$(shell cygpath $(CC32)) libopenam: $(OUT_OBJS) @$(ECHO) "[*** Creating "$@" shared library ***]" From 4530b5328e7c2f774e73e731b39c8c8022009b45 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Mon, 9 Jul 2018 23:20:30 +0300 Subject: [PATCH 046/212] - --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index d3e71132f..a53653930 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -73,7 +73,7 @@ endif #CC32 := cl #LINK32 :=link -CC32:=$(shell cygpath $(CC32)) +CC32:=$(shell cygpath "$(CC32)") libopenam: $(OUT_OBJS) @$(ECHO) "[*** Creating "$@" shared library ***]" From 63cd7cc9abcfd80a210a393e94a9dedcb069a096 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Mon, 9 Jul 2018 23:23:00 +0300 Subject: [PATCH 047/212] d --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index a53653930..18a85409a 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -73,7 +73,7 @@ endif #CC32 := cl #LINK32 :=link -CC32:=$(shell cygpath "$(CC32)") +CC32:="$(shell cygpath "$(CC32)")" libopenam: $(OUT_OBJS) @$(ECHO) "[*** Creating "$@" shared library ***]" From fd6b8da835fea5d0b716cb3e9f7555993a29d804 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Mon, 9 Jul 2018 23:33:13 +0300 Subject: [PATCH 048/212] d --- Makefile.windows.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 18a85409a..e79a961bd 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -73,7 +73,8 @@ endif #CC32 := cl #LINK32 :=link -CC32:="$(shell cygpath "$(CC32)")" +#CC32:="$(shell cygpath "$(CC32)")" +CC32:="$(CC32)" libopenam: $(OUT_OBJS) @$(ECHO) "[*** Creating "$@" shared library ***]" From 1474ff70e34214161ef4918c1b301c283e5e97e1 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Mon, 9 Jul 2018 23:51:00 +0300 Subject: [PATCH 049/212] s --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index e79a961bd..47f1087ef 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -74,7 +74,7 @@ endif #CC32 := cl #LINK32 :=link #CC32:="$(shell cygpath "$(CC32)")" -CC32:="$(CC32)" +CC32:="C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\BIN\cl.exe" libopenam: $(OUT_OBJS) @$(ECHO) "[*** Creating "$@" shared library ***]" From 681e9277545a4dd2770cc5e7023301c5658da70f Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 10 Jul 2018 00:02:29 +0300 Subject: [PATCH 050/212] d --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 47f1087ef..6c1fc370c 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -74,7 +74,7 @@ endif #CC32 := cl #LINK32 :=link #CC32:="$(shell cygpath "$(CC32)")" -CC32:="C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\BIN\cl.exe" +CC32:="C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\BIN\cl.exe" libopenam: $(OUT_OBJS) @$(ECHO) "[*** Creating "$@" shared library ***]" From ffc4dde50a1b7357752c4e3774209c53572efedc Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 10 Jul 2018 00:08:30 +0300 Subject: [PATCH 051/212] d --- Makefile.windows.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 6c1fc370c..0a5522114 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -73,8 +73,8 @@ endif #CC32 := cl #LINK32 :=link -#CC32:="$(shell cygpath "$(CC32)")" -CC32:="C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\BIN\cl.exe" +CC32:="$(shell cygpath "$(CC32)")" +#CC32:="C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\BIN\cl.exe" libopenam: $(OUT_OBJS) @$(ECHO) "[*** Creating "$@" shared library ***]" From c9ac9008f700d0f919334a390784358c78035e0f Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 10 Jul 2018 00:10:33 +0300 Subject: [PATCH 052/212] d --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 0a5522114..fb55d103d 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -74,7 +74,7 @@ endif #CC32 := cl #LINK32 :=link CC32:="$(shell cygpath "$(CC32)")" -#CC32:="C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\BIN\cl.exe" +CC32:=/c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio\ 14.0/VC/BIN/cl.exe libopenam: $(OUT_OBJS) @$(ECHO) "[*** Creating "$@" shared library ***]" From 78c43e43fe84d7059fed5c909cec4fab33a8c74c Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 10 Jul 2018 00:14:34 +0300 Subject: [PATCH 053/212] d --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index fb55d103d..ab37dabbc 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -74,7 +74,7 @@ endif #CC32 := cl #LINK32 :=link CC32:="$(shell cygpath "$(CC32)")" -CC32:=/c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio\ 14.0/VC/BIN/cl.exe +CC32:="/c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio\ 14.0/VC/BIN/cl.exe" libopenam: $(OUT_OBJS) @$(ECHO) "[*** Creating "$@" shared library ***]" From 07ff4eb5c9ce874154d4013271700db3de9d8dd3 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 10 Jul 2018 00:38:35 +0300 Subject: [PATCH 054/212] d --- Makefile | 2 +- Makefile.windows.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index a8de9a79d..2d8ecd574 100644 --- a/Makefile +++ b/Makefile @@ -36,7 +36,7 @@ ifneq ("$(PROGRAMFILES)$(ProgramFiles)","") RMALL := cmd /c del /F /Q RMDIR := cmd /c rmdir /S /Q SED := sed.exe - ECHO := cmd /c echo + ECHO := echo MKDIR := cmd /c mkdir CP := cmd /c copy /E /Y CD := cd diff --git a/Makefile.windows.mk b/Makefile.windows.mk index ab37dabbc..51f31d18e 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -73,8 +73,8 @@ endif #CC32 := cl #LINK32 :=link -CC32:="$(shell cygpath "$(CC32)")" -CC32:="/c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio\ 14.0/VC/BIN/cl.exe" +#CC32:="$(shell cygpath "$(CC32)")" +#CC32:="/c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio\ 14.0/VC/BIN/cl.exe" libopenam: $(OUT_OBJS) @$(ECHO) "[*** Creating "$@" shared library ***]" From a066cbdf547f0f776e6385855eb4cfa106c51516 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 10 Jul 2018 09:18:50 +0300 Subject: [PATCH 055/212] restore sed --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 2d8ecd574..8de914f8d 100644 --- a/Makefile +++ b/Makefile @@ -23,9 +23,9 @@ HTTPD22_VERSION=2.2.34 APR_VERSION=1.6.3 APR_UTIL_VERSION=1.6.1 -#ifndef 32 -64 := 1 -#endif +ifndef 32 + 64 := 1 +endif # DEBUG=1 @@ -196,12 +196,12 @@ version: pwd cmd /c $(CAT) source$(PS)version.template $(CAT) source$(PS)version.template - $(CAT) source$(PS)version.template | $(SED) -e "s$(SUB)_REVISION_$(SUB)$(REVISION)$(SUB)g" \ + $(SED) -e "s$(SUB)_REVISION_$(SUB)$(REVISION)$(SUB)g" \ -e "s$(SUB)_IDENT_DATE_$(SUB)$(IDENT_DATE)$(SUB)g" \ -e "s$(SUB)_BUILD_MACHINE_$(SUB)$(BUILD_MACHINE)$(SUB)g" \ -e "s$(SUB)_VERSION_NUM_$(SUB)$(VERSION_NUM)$(SUB)g" \ -e "s$(SUB)_CONTAINER_$(SUB)$(CONTAINER)$(SUB)g" \ - -e "s$(SUB)_VERSION_$(SUB)$(VERSION)$(SUB)g" >> source$(PS)version.h + -e "s$(SUB)_VERSION_$(SUB)$(VERSION)$(SUB)g" < source$(PS)version.template > source$(PS)version.h $(CAT) source$(PS)version.h clean: -$(RMDIR) $(OBJDIR) From 5643d60958586a8e320ce660f62ba545b8065a32 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 10 Jul 2018 09:21:30 +0300 Subject: [PATCH 056/212] cmd /c sed --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8de914f8d..b8e9aae7b 100644 --- a/Makefile +++ b/Makefile @@ -35,7 +35,7 @@ ifneq ("$(PROGRAMFILES)$(ProgramFiles)","") OS_ARCH := WINNT RMALL := cmd /c del /F /Q RMDIR := cmd /c rmdir /S /Q - SED := sed.exe + SED := cmd /c sed.exe ECHO := echo MKDIR := cmd /c mkdir CP := cmd /c copy /E /Y From 98ee2c497b42a2150b46c41a5800daa5a1399bfe Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 10 Jul 2018 09:29:40 +0300 Subject: [PATCH 057/212] powershell sed --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b8e9aae7b..9b142647c 100644 --- a/Makefile +++ b/Makefile @@ -35,7 +35,7 @@ ifneq ("$(PROGRAMFILES)$(ProgramFiles)","") OS_ARCH := WINNT RMALL := cmd /c del /F /Q RMDIR := cmd /c rmdir /S /Q - SED := cmd /c sed.exe + SED := powershell /c sed.exe ECHO := echo MKDIR := cmd /c mkdir CP := cmd /c copy /E /Y From b0e393b40831721593cc6bcb587f1c0ca8283ca4 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 10 Jul 2018 09:35:08 +0300 Subject: [PATCH 058/212] d --- Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 9b142647c..ca7f941f6 100644 --- a/Makefile +++ b/Makefile @@ -35,7 +35,7 @@ ifneq ("$(PROGRAMFILES)$(ProgramFiles)","") OS_ARCH := WINNT RMALL := cmd /c del /F /Q RMDIR := cmd /c rmdir /S /Q - SED := powershell /c sed.exe + SED := sed ECHO := echo MKDIR := cmd /c mkdir CP := cmd /c copy /E /Y @@ -194,14 +194,13 @@ version: @$(ECHO) "[***** Updating version.h *****]" -$(RMALL) source$(PS)version.h pwd - cmd /c $(CAT) source$(PS)version.template $(CAT) source$(PS)version.template $(SED) -e "s$(SUB)_REVISION_$(SUB)$(REVISION)$(SUB)g" \ -e "s$(SUB)_IDENT_DATE_$(SUB)$(IDENT_DATE)$(SUB)g" \ -e "s$(SUB)_BUILD_MACHINE_$(SUB)$(BUILD_MACHINE)$(SUB)g" \ -e "s$(SUB)_VERSION_NUM_$(SUB)$(VERSION_NUM)$(SUB)g" \ -e "s$(SUB)_CONTAINER_$(SUB)$(CONTAINER)$(SUB)g" \ - -e "s$(SUB)_VERSION_$(SUB)$(VERSION)$(SUB)g" < source$(PS)version.template > source$(PS)version.h + -e "s$(SUB)_VERSION_$(SUB)$(VERSION)$(SUB)g" source$(PS)version.template >> source$(PS)version.h $(CAT) source$(PS)version.h clean: -$(RMDIR) $(OBJDIR) From aa995970d0e3466284c10b270081e93c41407cbf Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 10 Jul 2018 09:37:20 +0300 Subject: [PATCH 059/212] SHELL=powershell --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index ca7f941f6..42c0ff211 100644 --- a/Makefile +++ b/Makefile @@ -53,6 +53,7 @@ ifneq ("$(PROGRAMFILES)$(ProgramFiles)","") UTAR=7z x UBZIP=7z x WGET=powershell /c Invoke-WebRequest + SHELL=powershell else OS_ARCH := $(shell uname -s) OS_MARCH := $(shell uname -m) From cb110ad2fb23265d52c1763e9f58cb42bfdbe752 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 10 Jul 2018 09:57:07 +0300 Subject: [PATCH 060/212] ss --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 42c0ff211..4d9be5a29 100644 --- a/Makefile +++ b/Makefile @@ -53,7 +53,7 @@ ifneq ("$(PROGRAMFILES)$(ProgramFiles)","") UTAR=7z x UBZIP=7z x WGET=powershell /c Invoke-WebRequest - SHELL=powershell + SHELL:=powershell else OS_ARCH := $(shell uname -s) OS_MARCH := $(shell uname -m) @@ -201,7 +201,7 @@ version: -e "s$(SUB)_BUILD_MACHINE_$(SUB)$(BUILD_MACHINE)$(SUB)g" \ -e "s$(SUB)_VERSION_NUM_$(SUB)$(VERSION_NUM)$(SUB)g" \ -e "s$(SUB)_CONTAINER_$(SUB)$(CONTAINER)$(SUB)g" \ - -e "s$(SUB)_VERSION_$(SUB)$(VERSION)$(SUB)g" source$(PS)version.template >> source$(PS)version.h + -e "s$(SUB)_VERSION_$(SUB)$(VERSION)$(SUB)g" source/version.template >> source/version.h $(CAT) source$(PS)version.h clean: -$(RMDIR) $(OBJDIR) From bee389dafacbe3d352c1cae838c5312ac37cac19 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 10 Jul 2018 10:01:52 +0300 Subject: [PATCH 061/212] d --- Makefile.windows.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 51f31d18e..b0c4c5e52 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -75,6 +75,7 @@ endif #LINK32 :=link #CC32:="$(shell cygpath "$(CC32)")" #CC32:="/c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio\ 14.0/VC/BIN/cl.exe" +CC32:="$(CC32)" libopenam: $(OUT_OBJS) @$(ECHO) "[*** Creating "$@" shared library ***]" From 724fbbf36019d8d59cdbdb5b6e74b17af8ea9394 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 10 Jul 2018 10:06:33 +0300 Subject: [PATCH 062/212] iss --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index b0c4c5e52..6af8796ec 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -75,7 +75,7 @@ endif #LINK32 :=link #CC32:="$(shell cygpath "$(CC32)")" #CC32:="/c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio\ 14.0/VC/BIN/cl.exe" -CC32:="$(CC32)" +CC32:=cmd /c "$(CC32)" libopenam: $(OUT_OBJS) @$(ECHO) "[*** Creating "$@" shared library ***]" From f5eb3f22893285993745c710cc6c97bdb7ae2004 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 10 Jul 2018 10:10:58 +0300 Subject: [PATCH 063/212] d --- Makefile.windows.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 6af8796ec..bf24651aa 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -75,7 +75,8 @@ endif #LINK32 :=link #CC32:="$(shell cygpath "$(CC32)")" #CC32:="/c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio\ 14.0/VC/BIN/cl.exe" -CC32:=cmd /c "$(CC32)" +SHELL:=powershell +CC32:="$(CC32)" libopenam: $(OUT_OBJS) @$(ECHO) "[*** Creating "$@" shared library ***]" From d29203316bd9eccba16ab4b0929edc9a68fb3dc8 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 10 Jul 2018 10:29:40 +0300 Subject: [PATCH 064/212] iieee --- Makefile.windows.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index bf24651aa..917b94f1e 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -75,8 +75,7 @@ endif #LINK32 :=link #CC32:="$(shell cygpath "$(CC32)")" #CC32:="/c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio\ 14.0/VC/BIN/cl.exe" -SHELL:=powershell -CC32:="$(CC32)" +#CC32:="$(CC32)" libopenam: $(OUT_OBJS) @$(ECHO) "[*** Creating "$@" shared library ***]" From 390285f6951ef310fdf5a870e9900849216301ab Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 10 Jul 2018 10:35:20 +0300 Subject: [PATCH 065/212] ss --- Makefile.windows.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 917b94f1e..9f9660ac7 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -76,6 +76,7 @@ endif #CC32:="$(shell cygpath "$(CC32)")" #CC32:="/c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio\ 14.0/VC/BIN/cl.exe" #CC32:="$(CC32)" +CC32:=C:\Program Files \(x86\)\Microsoft Visual Studio 14.0\VC\BIN\cl.exe libopenam: $(OUT_OBJS) @$(ECHO) "[*** Creating "$@" shared library ***]" From 23c588d2aa1a993ae385a605db8ea70b2a49dc38 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 10 Jul 2018 10:51:35 +0300 Subject: [PATCH 066/212] id --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 4d9be5a29..59a246168 100644 --- a/Makefile +++ b/Makefile @@ -33,7 +33,7 @@ VERSION := 4.1.0 ifneq ("$(PROGRAMFILES)$(ProgramFiles)","") OS_ARCH := WINNT - RMALL := cmd /c del /F /Q + RMALL := del /F /Q RMDIR := cmd /c rmdir /S /Q SED := sed ECHO := echo From d37e3b3c246356f4fbda8b73fe4a74c9f9ff1c63 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 10 Jul 2018 10:57:15 +0300 Subject: [PATCH 067/212] d --- Makefile | 2 +- Makefile.windows.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 59a246168..0fd572ac8 100644 --- a/Makefile +++ b/Makefile @@ -33,7 +33,7 @@ VERSION := 4.1.0 ifneq ("$(PROGRAMFILES)$(ProgramFiles)","") OS_ARCH := WINNT - RMALL := del /F /Q + RMALL := rm -rf RMDIR := cmd /c rmdir /S /Q SED := sed ECHO := echo diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 9f9660ac7..469a313b4 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -82,7 +82,7 @@ libopenam: $(OUT_OBJS) @$(ECHO) "[*** Creating "$@" shared library ***]" -$(RMALL) $(OBJDIR)$(PS)version.* $(SED) -e "s$(SUB)_FILE_NAME_$(SUB)libopenam.dll$(SUB)g" \ - -e "s$(SUB)_FILE_TYPE_$(SUB)VFT_DLL$(SUB)g" < source$(PS)version.rc.template > $(OBJDIR)$(PS)version.rc + -e "s$(SUB)_FILE_TYPE_$(SUB)VFT_DLL$(SUB)g" source/version.rc.template >> $(OBJDIR)/version.rc $(RC) /l 0x0409 /nologo /fo $(OBJDIR)$(PS)version.res $(OBJDIR)$(PS)version.rc ${LINK} $(SHARED) $(LDFLAGS) $(OUT_OBJS) $(OBJDIR)$(PS)version.res /OUT:build\$@.dll /PDB:build\$@.pdb \ $(LIBS) From 988d42cf7790e44db70be5d18fddb3368c6a0e5b Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 10 Jul 2018 11:00:05 +0300 Subject: [PATCH 068/212] d --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 469a313b4..e571e8407 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -125,7 +125,7 @@ iis32: $(OUT_OBJS) $(IIS_OUT_OBJS) @$(ECHO) "[*** Creating "$@" shared library ***]" -$(RMALL) $(OBJDIR)$(PS)version.* $(SED) -e "s$(SUB)_FILE_NAME_$(SUB)mod_iis_openam_32.dll$(SUB)g" \ - -e "s$(SUB)_FILE_TYPE_$(SUB)VFT_DLL$(SUB)g" < source$(PS)version.rc.template > $(OBJDIR)$(PS)version.rc + -e "s$(SUB)_FILE_TYPE_$(SUB)VFT_DLL$(SUB)g" source/version.rc.template >> $(OBJDIR)/version.rc $(RC) /l 0x0409 /nologo /fo $(OBJDIR)$(PS)version.res $(OBJDIR)$(PS)version.rc "${LINK32}" $(SHARED) /LIBPATH:"$(LIB32_SDK)\x86" /LIBPATH:"$(LIB32_VC)\LIB" $(LDFLAGS) $(OUT_OBJS) $(IIS_OUT_OBJS) \ $(OBJDIR)$(PS)version.res /OUT:build\mod_iis_openam_32.dll \ From 88089edf8c1bf46677fd049e17f9e81254ce0ffb Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 10 Jul 2018 11:04:45 +0300 Subject: [PATCH 069/212] d --- Makefile.windows.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index e571e8407..07d2ff076 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -77,6 +77,7 @@ endif #CC32:="/c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio\ 14.0/VC/BIN/cl.exe" #CC32:="$(CC32)" CC32:=C:\Program Files \(x86\)\Microsoft Visual Studio 14.0\VC\BIN\cl.exe +LINK32:=C:\Program Files \(x86\)\Microsoft Visual Studio 14.0\VC\BIN\link.exe libopenam: $(OUT_OBJS) @$(ECHO) "[*** Creating "$@" shared library ***]" @@ -127,7 +128,7 @@ iis32: $(OUT_OBJS) $(IIS_OUT_OBJS) $(SED) -e "s$(SUB)_FILE_NAME_$(SUB)mod_iis_openam_32.dll$(SUB)g" \ -e "s$(SUB)_FILE_TYPE_$(SUB)VFT_DLL$(SUB)g" source/version.rc.template >> $(OBJDIR)/version.rc $(RC) /l 0x0409 /nologo /fo $(OBJDIR)$(PS)version.res $(OBJDIR)$(PS)version.rc - "${LINK32}" $(SHARED) /LIBPATH:"$(LIB32_SDK)\x86" /LIBPATH:"$(LIB32_VC)\LIB" $(LDFLAGS) $(OUT_OBJS) $(IIS_OUT_OBJS) \ + ${LINK32} $(SHARED) /LIBPATH:"$(LIB32_SDK)\x86" /LIBPATH:"$(LIB32_VC)\LIB" $(LDFLAGS) $(OUT_OBJS) $(IIS_OUT_OBJS) \ $(OBJDIR)$(PS)version.res /OUT:build\mod_iis_openam_32.dll \ /PDB:build\mod_iis_openam_32.pdb $(LIBS) /EXPORT:RegisterModule oleaut32.lib $(CP) $(OBJDIR)$(PS)mod_iis_openam_32.dll $(OBJDIR)$(PS)dist From 9e9f44ea2a140eb54265d704eaf1fb91778cc6b8 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 10 Jul 2018 11:12:59 +0300 Subject: [PATCH 070/212] d --- Makefile.windows.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 07d2ff076..7d4b91924 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -78,6 +78,7 @@ endif #CC32:="$(CC32)" CC32:=C:\Program Files \(x86\)\Microsoft Visual Studio 14.0\VC\BIN\cl.exe LINK32:=C:\Program Files \(x86\)\Microsoft Visual Studio 14.0\VC\BIN\link.exe +LIB32_VC:=C:\Program Files \(x86\)\Microsoft Visual Studio 14.0\VC libopenam: $(OUT_OBJS) @$(ECHO) "[*** Creating "$@" shared library ***]" From a267018602d4993b674c40b2ad43107526e82ba3 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 10 Jul 2018 11:18:02 +0300 Subject: [PATCH 071/212] d --- Makefile.windows.mk | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 7d4b91924..33bee7a78 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -78,7 +78,7 @@ endif #CC32:="$(CC32)" CC32:=C:\Program Files \(x86\)\Microsoft Visual Studio 14.0\VC\BIN\cl.exe LINK32:=C:\Program Files \(x86\)\Microsoft Visual Studio 14.0\VC\BIN\link.exe -LIB32_VC:=C:\Program Files \(x86\)\Microsoft Visual Studio 14.0\VC +#LIB32_VC:=C:\Program Files \(x86\)\Microsoft Visual Studio 14.0\VC libopenam: $(OUT_OBJS) @$(ECHO) "[*** Creating "$@" shared library ***]" @@ -129,9 +129,7 @@ iis32: $(OUT_OBJS) $(IIS_OUT_OBJS) $(SED) -e "s$(SUB)_FILE_NAME_$(SUB)mod_iis_openam_32.dll$(SUB)g" \ -e "s$(SUB)_FILE_TYPE_$(SUB)VFT_DLL$(SUB)g" source/version.rc.template >> $(OBJDIR)/version.rc $(RC) /l 0x0409 /nologo /fo $(OBJDIR)$(PS)version.res $(OBJDIR)$(PS)version.rc - ${LINK32} $(SHARED) /LIBPATH:"$(LIB32_SDK)\x86" /LIBPATH:"$(LIB32_VC)\LIB" $(LDFLAGS) $(OUT_OBJS) $(IIS_OUT_OBJS) \ - $(OBJDIR)$(PS)version.res /OUT:build\mod_iis_openam_32.dll \ - /PDB:build\mod_iis_openam_32.pdb $(LIBS) /EXPORT:RegisterModule oleaut32.lib + ${LINK32} $(SHARED) /LIBPATH:"$(LIB32_SDK)\x86" /LIBPATH:"$(LIB32_VC)\LIB" $(LDFLAGS) $(OUT_OBJS) $(IIS_OUT_OBJS) $(OBJDIR)$(PS)version.res /OUT:build\mod_iis_openam_32.dll /PDB:build\mod_iis_openam_32.pdb $(LIBS) /EXPORT:RegisterModule oleaut32.lib $(CP) $(OBJDIR)$(PS)mod_iis_openam_32.dll $(OBJDIR)$(PS)dist $(CP) $(OBJDIR)$(PS)mod_iis_openam_32.pdb $(OBJDIR)$(PS)dist From b8169ea5527d2cf5b3e22e70ede78e5c9f9154b4 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 10 Jul 2018 11:21:52 +0300 Subject: [PATCH 072/212] W: --- Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile index 0fd572ac8..7f1f4f31d 100644 --- a/Makefile +++ b/Makefile @@ -53,7 +53,6 @@ ifneq ("$(PROGRAMFILES)$(ProgramFiles)","") UTAR=7z x UBZIP=7z x WGET=powershell /c Invoke-WebRequest - SHELL:=powershell else OS_ARCH := $(shell uname -s) OS_MARCH := $(shell uname -m) From 1e1310ff4bbfb686dbec92b36b142b8d458c3aaf Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 10 Jul 2018 11:33:48 +0300 Subject: [PATCH 073/212] d:c --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 33bee7a78..7f0b4ec83 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -77,7 +77,7 @@ endif #CC32:="/c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio\ 14.0/VC/BIN/cl.exe" #CC32:="$(CC32)" CC32:=C:\Program Files \(x86\)\Microsoft Visual Studio 14.0\VC\BIN\cl.exe -LINK32:=C:\Program Files \(x86\)\Microsoft Visual Studio 14.0\VC\BIN\link.exe +LINK32:=C:\Program Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\BIN\link.exe #LIB32_VC:=C:\Program Files \(x86\)\Microsoft Visual Studio 14.0\VC libopenam: $(OUT_OBJS) From 6cf22452dbf32e0193df37c1ce72ba6162398247 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 10 Jul 2018 11:45:09 +0300 Subject: [PATCH 074/212] dd --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 7f0b4ec83..672d1736d 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -129,7 +129,7 @@ iis32: $(OUT_OBJS) $(IIS_OUT_OBJS) $(SED) -e "s$(SUB)_FILE_NAME_$(SUB)mod_iis_openam_32.dll$(SUB)g" \ -e "s$(SUB)_FILE_TYPE_$(SUB)VFT_DLL$(SUB)g" source/version.rc.template >> $(OBJDIR)/version.rc $(RC) /l 0x0409 /nologo /fo $(OBJDIR)$(PS)version.res $(OBJDIR)$(PS)version.rc - ${LINK32} $(SHARED) /LIBPATH:"$(LIB32_SDK)\x86" /LIBPATH:"$(LIB32_VC)\LIB" $(LDFLAGS) $(OUT_OBJS) $(IIS_OUT_OBJS) $(OBJDIR)$(PS)version.res /OUT:build\mod_iis_openam_32.dll /PDB:build\mod_iis_openam_32.pdb $(LIBS) /EXPORT:RegisterModule oleaut32.lib + ${LINK32} $(SHARED) /LIBPATH:"$(LIB32_SDK)\x86" /LIBPATH:"$(LIB32_VC)\LIB" $(LDFLAGS) $(OUT_OBJS) $(IIS_OUT_OBJS) $(OBJDIR)/version.res /OUT:build\mod_iis_openam_32.dll /PDB:build\mod_iis_openam_32.pdb $(LIBS) /EXPORT:RegisterModule oleaut32.lib $(CP) $(OBJDIR)$(PS)mod_iis_openam_32.dll $(OBJDIR)$(PS)dist $(CP) $(OBJDIR)$(PS)mod_iis_openam_32.pdb $(OBJDIR)$(PS)dist From 0d00984da04a2b5632b0fb37b17a6566fd3b6d92 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 10 Jul 2018 11:53:45 +0300 Subject: [PATCH 075/212] k --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 672d1736d..110d71194 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -77,7 +77,7 @@ endif #CC32:="/c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio\ 14.0/VC/BIN/cl.exe" #CC32:="$(CC32)" CC32:=C:\Program Files \(x86\)\Microsoft Visual Studio 14.0\VC\BIN\cl.exe -LINK32:=C:\Program Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\BIN\link.exe +LINK32:=C:\Program Files \(x86\)\Microsoft Visual Studio 14.0\VC\BIN\link.exe #LIB32_VC:=C:\Program Files \(x86\)\Microsoft Visual Studio 14.0\VC libopenam: $(OUT_OBJS) From 870a36afb4aa366df86a280a30586a6881b5bf14 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 10 Jul 2018 11:57:03 +0300 Subject: [PATCH 076/212] jj --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 110d71194..3014c8bcf 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -78,7 +78,7 @@ endif #CC32:="$(CC32)" CC32:=C:\Program Files \(x86\)\Microsoft Visual Studio 14.0\VC\BIN\cl.exe LINK32:=C:\Program Files \(x86\)\Microsoft Visual Studio 14.0\VC\BIN\link.exe -#LIB32_VC:=C:\Program Files \(x86\)\Microsoft Visual Studio 14.0\VC +LIB32_VC:=C:\Program Files \(x86\)\Microsoft Visual Studio 14.0\VC libopenam: $(OUT_OBJS) @$(ECHO) "[*** Creating "$@" shared library ***]" From 4aaf6843ca3895a97eea06ac1ff10596f04ededc Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 10 Jul 2018 12:25:43 +0300 Subject: [PATCH 077/212] dd --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 3014c8bcf..5bdf549f5 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -76,7 +76,7 @@ endif #CC32:="$(shell cygpath "$(CC32)")" #CC32:="/c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio\ 14.0/VC/BIN/cl.exe" #CC32:="$(CC32)" -CC32:=C:\Program Files \(x86\)\Microsoft Visual Studio 14.0\VC\BIN\cl.exe +CC32:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\BIN\cl.exe LINK32:=C:\Program Files \(x86\)\Microsoft Visual Studio 14.0\VC\BIN\link.exe LIB32_VC:=C:\Program Files \(x86\)\Microsoft Visual Studio 14.0\VC From 496ec074e37bf14159f01877b2228917d4ce8f3c Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 10 Jul 2018 12:28:48 +0300 Subject: [PATCH 078/212] %( --- Makefile.windows.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 5bdf549f5..4424573a0 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -77,8 +77,8 @@ endif #CC32:="/c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio\ 14.0/VC/BIN/cl.exe" #CC32:="$(CC32)" CC32:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\BIN\cl.exe -LINK32:=C:\Program Files \(x86\)\Microsoft Visual Studio 14.0\VC\BIN\link.exe -LIB32_VC:=C:\Program Files \(x86\)\Microsoft Visual Studio 14.0\VC +LINK32:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\BIN\link.exe +#LIB32_VC:=C:\Program Files \(x86\)\Microsoft Visual Studio 14.0\VC libopenam: $(OUT_OBJS) @$(ECHO) "[*** Creating "$@" shared library ***]" From ea087f84b88180b7f9aacf1bebf002541bcfcc67 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 10 Jul 2018 12:42:07 +0300 Subject: [PATCH 079/212] - --- Makefile.windows.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 4424573a0..1f97f954f 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -129,6 +129,7 @@ iis32: $(OUT_OBJS) $(IIS_OUT_OBJS) $(SED) -e "s$(SUB)_FILE_NAME_$(SUB)mod_iis_openam_32.dll$(SUB)g" \ -e "s$(SUB)_FILE_TYPE_$(SUB)VFT_DLL$(SUB)g" source/version.rc.template >> $(OBJDIR)/version.rc $(RC) /l 0x0409 /nologo /fo $(OBJDIR)$(PS)version.res $(OBJDIR)$(PS)version.rc + ls C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\BIN\ ${LINK32} $(SHARED) /LIBPATH:"$(LIB32_SDK)\x86" /LIBPATH:"$(LIB32_VC)\LIB" $(LDFLAGS) $(OUT_OBJS) $(IIS_OUT_OBJS) $(OBJDIR)/version.res /OUT:build\mod_iis_openam_32.dll /PDB:build\mod_iis_openam_32.pdb $(LIBS) /EXPORT:RegisterModule oleaut32.lib $(CP) $(OBJDIR)$(PS)mod_iis_openam_32.dll $(OBJDIR)$(PS)dist $(CP) $(OBJDIR)$(PS)mod_iis_openam_32.pdb $(OBJDIR)$(PS)dist From 69e445841f564fb1af84de31b7024ece2a3e9e7d Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 10 Jul 2018 12:49:49 +0300 Subject: [PATCH 080/212] - --- Makefile.windows.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 1f97f954f..fbcb8ac42 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -48,7 +48,7 @@ ifeq (,$(CC32)) CC32 := $(shell powershell 'Get-Command cl.exe | Where-Object {$$_.Definition -like "*amd64*"} | Select-Object -ExpandProperty Definition | split-path -parent | split-path -parent')\cl.exe endif ifeq (,$(LINK32)) -LINK32 := $(shell powershell 'Get-Command cl.exe | Where-Object {$$_.Definition -like "*amd64*"} | Select-Object -ExpandProperty Definition | split-path -parent | split-path -parent')\link.exe +LINK32 := $(shell powershell 'Get-Command link.exe | Where-Object {$$_.Definition -like "*amd64*"} | Select-Object -ExpandProperty Definition | split-path -parent | split-path -parent')\link.exe endif ifeq (,$(LIB32_VC)) LIB32_VC := $(shell powershell 'Get-Command cl.exe | Where-Object {$$_.Definition -like "*amd64*"} | Select-Object -ExpandProperty Definition | split-path -parent | split-path -parent | split-path -parent') @@ -77,7 +77,7 @@ endif #CC32:="/c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio\ 14.0/VC/BIN/cl.exe" #CC32:="$(CC32)" CC32:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\BIN\cl.exe -LINK32:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\BIN\link.exe +LINK32:=$(shell cygpath "$(LINK32)") #LIB32_VC:=C:\Program Files \(x86\)\Microsoft Visual Studio 14.0\VC libopenam: $(OUT_OBJS) From e6554c8bc206b4bd0492b9a936e716ca3e349ec3 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 10 Jul 2018 14:52:31 +0300 Subject: [PATCH 081/212] o --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index fbcb8ac42..889d3b4f4 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -78,7 +78,7 @@ endif #CC32:="$(CC32)" CC32:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\BIN\cl.exe LINK32:=$(shell cygpath "$(LINK32)") -#LIB32_VC:=C:\Program Files \(x86\)\Microsoft Visual Studio 14.0\VC +LIB32_VC:=C:\Program Files \(x86\)\Microsoft Visual Studio 14.0\VC libopenam: $(OUT_OBJS) @$(ECHO) "[*** Creating "$@" shared library ***]" From 8e97c96ca2cd7b8f6301b22d5af6a0182b7028c1 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 10 Jul 2018 15:01:49 +0300 Subject: [PATCH 082/212] 0 --- Makefile.windows.mk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 889d3b4f4..66888ebbd 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -77,8 +77,9 @@ endif #CC32:="/c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio\ 14.0/VC/BIN/cl.exe" #CC32:="$(CC32)" CC32:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\BIN\cl.exe -LINK32:=$(shell cygpath "$(LINK32)") -LIB32_VC:=C:\Program Files \(x86\)\Microsoft Visual Studio 14.0\VC +#LINK32:=$(shell cygpath "$(LINK32)") +LINK32 :=link +#LIB32_VC:=C:\Program Files \(x86\)\Microsoft Visual Studio 14.0\VC libopenam: $(OUT_OBJS) @$(ECHO) "[*** Creating "$@" shared library ***]" @@ -129,7 +130,7 @@ iis32: $(OUT_OBJS) $(IIS_OUT_OBJS) $(SED) -e "s$(SUB)_FILE_NAME_$(SUB)mod_iis_openam_32.dll$(SUB)g" \ -e "s$(SUB)_FILE_TYPE_$(SUB)VFT_DLL$(SUB)g" source/version.rc.template >> $(OBJDIR)/version.rc $(RC) /l 0x0409 /nologo /fo $(OBJDIR)$(PS)version.res $(OBJDIR)$(PS)version.rc - ls C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\BIN\ + cmd /c dir C:\Program Files (x86)\Microsoft\Visual Studio 14.0\VC\BIN\ ${LINK32} $(SHARED) /LIBPATH:"$(LIB32_SDK)\x86" /LIBPATH:"$(LIB32_VC)\LIB" $(LDFLAGS) $(OUT_OBJS) $(IIS_OUT_OBJS) $(OBJDIR)/version.res /OUT:build\mod_iis_openam_32.dll /PDB:build\mod_iis_openam_32.pdb $(LIBS) /EXPORT:RegisterModule oleaut32.lib $(CP) $(OBJDIR)$(PS)mod_iis_openam_32.dll $(OBJDIR)$(PS)dist $(CP) $(OBJDIR)$(PS)mod_iis_openam_32.pdb $(OBJDIR)$(PS)dist From 164dba595df8233f811cedb8ab82e93f916154d8 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 10 Jul 2018 15:06:05 +0300 Subject: [PATCH 083/212] o --- Makefile.windows.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 66888ebbd..c84946232 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -130,7 +130,6 @@ iis32: $(OUT_OBJS) $(IIS_OUT_OBJS) $(SED) -e "s$(SUB)_FILE_NAME_$(SUB)mod_iis_openam_32.dll$(SUB)g" \ -e "s$(SUB)_FILE_TYPE_$(SUB)VFT_DLL$(SUB)g" source/version.rc.template >> $(OBJDIR)/version.rc $(RC) /l 0x0409 /nologo /fo $(OBJDIR)$(PS)version.res $(OBJDIR)$(PS)version.rc - cmd /c dir C:\Program Files (x86)\Microsoft\Visual Studio 14.0\VC\BIN\ ${LINK32} $(SHARED) /LIBPATH:"$(LIB32_SDK)\x86" /LIBPATH:"$(LIB32_VC)\LIB" $(LDFLAGS) $(OUT_OBJS) $(IIS_OUT_OBJS) $(OBJDIR)/version.res /OUT:build\mod_iis_openam_32.dll /PDB:build\mod_iis_openam_32.pdb $(LIBS) /EXPORT:RegisterModule oleaut32.lib $(CP) $(OBJDIR)$(PS)mod_iis_openam_32.dll $(OBJDIR)$(PS)dist $(CP) $(OBJDIR)$(PS)mod_iis_openam_32.pdb $(OBJDIR)$(PS)dist From b5e70bbacdd2a454a1820ac3fc421233773039ec Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 10 Jul 2018 15:11:11 +0300 Subject: [PATCH 084/212] i --- Makefile.windows.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index c84946232..150a5c393 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -76,9 +76,9 @@ endif #CC32:="$(shell cygpath "$(CC32)")" #CC32:="/c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio\ 14.0/VC/BIN/cl.exe" #CC32:="$(CC32)" -CC32:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\BIN\cl.exe +CC32:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\cl.exe #LINK32:=$(shell cygpath "$(LINK32)") -LINK32 :=link +LINK32 :=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\link.exe #LIB32_VC:=C:\Program Files \(x86\)\Microsoft Visual Studio 14.0\VC libopenam: $(OUT_OBJS) From b2f3d4bdd265eb51867b3ce38dd055650e78cdaf Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 10 Jul 2018 15:13:54 +0300 Subject: [PATCH 085/212] o --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 150a5c393..40e9a6bc5 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -78,7 +78,7 @@ endif #CC32:="$(CC32)" CC32:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\cl.exe #LINK32:=$(shell cygpath "$(LINK32)") -LINK32 :=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\link.exe +LINK32 :=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\amd64\link.exe #LIB32_VC:=C:\Program Files \(x86\)\Microsoft Visual Studio 14.0\VC libopenam: $(OUT_OBJS) From 1109bed3ab41f9aef3b59b903c20c4bcd7e49b81 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 10 Jul 2018 15:25:05 +0300 Subject: [PATCH 086/212] - --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 40e9a6bc5..13bf2359b 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -78,7 +78,7 @@ endif #CC32:="$(CC32)" CC32:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\cl.exe #LINK32:=$(shell cygpath "$(LINK32)") -LINK32 :=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\amd64\link.exe +LINK32 :=cmd /c C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\link.exe #LIB32_VC:=C:\Program Files \(x86\)\Microsoft Visual Studio 14.0\VC libopenam: $(OUT_OBJS) From f540b160d77256574e451b8faba4bb018c73ec46 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 10 Jul 2018 15:27:59 +0300 Subject: [PATCH 087/212] o --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 13bf2359b..150a5c393 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -78,7 +78,7 @@ endif #CC32:="$(CC32)" CC32:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\cl.exe #LINK32:=$(shell cygpath "$(LINK32)") -LINK32 :=cmd /c C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\link.exe +LINK32 :=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\link.exe #LIB32_VC:=C:\Program Files \(x86\)\Microsoft Visual Studio 14.0\VC libopenam: $(OUT_OBJS) From 9e1f5d940f0c7236b247d82dda076f9588496f87 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 10 Jul 2018 15:55:04 +0300 Subject: [PATCH 088/212] - --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 150a5c393..d15a4430f 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -130,7 +130,7 @@ iis32: $(OUT_OBJS) $(IIS_OUT_OBJS) $(SED) -e "s$(SUB)_FILE_NAME_$(SUB)mod_iis_openam_32.dll$(SUB)g" \ -e "s$(SUB)_FILE_TYPE_$(SUB)VFT_DLL$(SUB)g" source/version.rc.template >> $(OBJDIR)/version.rc $(RC) /l 0x0409 /nologo /fo $(OBJDIR)$(PS)version.res $(OBJDIR)$(PS)version.rc - ${LINK32} $(SHARED) /LIBPATH:"$(LIB32_SDK)\x86" /LIBPATH:"$(LIB32_VC)\LIB" $(LDFLAGS) $(OUT_OBJS) $(IIS_OUT_OBJS) $(OBJDIR)/version.res /OUT:build\mod_iis_openam_32.dll /PDB:build\mod_iis_openam_32.pdb $(LIBS) /EXPORT:RegisterModule oleaut32.lib + ${LINK32} $(SHARED) /LIBPATH:\"$(LIB32_SDK)\x86\" /LIBPATH:\"$(LIB32_VC)\LIB\" $(LDFLAGS) $(OUT_OBJS) $(IIS_OUT_OBJS) $(OBJDIR)/version.res /OUT:build\mod_iis_openam_32.dll /PDB:build\mod_iis_openam_32.pdb $(LIBS) /EXPORT:RegisterModule oleaut32.lib $(CP) $(OBJDIR)$(PS)mod_iis_openam_32.dll $(OBJDIR)$(PS)dist $(CP) $(OBJDIR)$(PS)mod_iis_openam_32.pdb $(OBJDIR)$(PS)dist From 718de3b4f2b3d71fc754d1da6d9df2a87ca9eac5 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 10 Jul 2018 16:21:49 +0300 Subject: [PATCH 089/212] o --- Makefile.windows.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index d15a4430f..ca1720e56 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -79,7 +79,7 @@ endif CC32:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\cl.exe #LINK32:=$(shell cygpath "$(LINK32)") LINK32 :=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\link.exe -#LIB32_VC:=C:\Program Files \(x86\)\Microsoft Visual Studio 14.0\VC +LIB32_VC:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC libopenam: $(OUT_OBJS) @$(ECHO) "[*** Creating "$@" shared library ***]" @@ -130,7 +130,7 @@ iis32: $(OUT_OBJS) $(IIS_OUT_OBJS) $(SED) -e "s$(SUB)_FILE_NAME_$(SUB)mod_iis_openam_32.dll$(SUB)g" \ -e "s$(SUB)_FILE_TYPE_$(SUB)VFT_DLL$(SUB)g" source/version.rc.template >> $(OBJDIR)/version.rc $(RC) /l 0x0409 /nologo /fo $(OBJDIR)$(PS)version.res $(OBJDIR)$(PS)version.rc - ${LINK32} $(SHARED) /LIBPATH:\"$(LIB32_SDK)\x86\" /LIBPATH:\"$(LIB32_VC)\LIB\" $(LDFLAGS) $(OUT_OBJS) $(IIS_OUT_OBJS) $(OBJDIR)/version.res /OUT:build\mod_iis_openam_32.dll /PDB:build\mod_iis_openam_32.pdb $(LIBS) /EXPORT:RegisterModule oleaut32.lib + $(LINK32) $(SHARED) /LIBPATH:"$(LIB32_SDK)\x86" /LIBPATH:"$(LIB32_VC)\LIB" $(LDFLAGS) $(OUT_OBJS) $(IIS_OUT_OBJS) $(OBJDIR)/version.res /OUT:build/mod_iis_openam_32.dll /PDB:build/mod_iis_openam_32.pdb $(LIBS) /EXPORT:RegisterModule oleaut32.lib $(CP) $(OBJDIR)$(PS)mod_iis_openam_32.dll $(OBJDIR)$(PS)dist $(CP) $(OBJDIR)$(PS)mod_iis_openam_32.pdb $(OBJDIR)$(PS)dist From 30488c15f445864e52798771e380f661753b48f1 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 10 Jul 2018 18:00:36 +0300 Subject: [PATCH 090/212] i --- Makefile.windows.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index ca1720e56..77b31bff4 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -130,7 +130,8 @@ iis32: $(OUT_OBJS) $(IIS_OUT_OBJS) $(SED) -e "s$(SUB)_FILE_NAME_$(SUB)mod_iis_openam_32.dll$(SUB)g" \ -e "s$(SUB)_FILE_TYPE_$(SUB)VFT_DLL$(SUB)g" source/version.rc.template >> $(OBJDIR)/version.rc $(RC) /l 0x0409 /nologo /fo $(OBJDIR)$(PS)version.res $(OBJDIR)$(PS)version.rc - $(LINK32) $(SHARED) /LIBPATH:"$(LIB32_SDK)\x86" /LIBPATH:"$(LIB32_VC)\LIB" $(LDFLAGS) $(OUT_OBJS) $(IIS_OUT_OBJS) $(OBJDIR)/version.res /OUT:build/mod_iis_openam_32.dll /PDB:build/mod_iis_openam_32.pdb $(LIBS) /EXPORT:RegisterModule oleaut32.lib + $(LINK32) $(SHARED) + #/LIBPATH:"$(LIB32_SDK)\x86" /LIBPATH:"$(LIB32_VC)\LIB" $(LDFLAGS) $(OUT_OBJS) $(IIS_OUT_OBJS) $(OBJDIR)/version.res /OUT:build/mod_iis_openam_32.dll /PDB:build/mod_iis_openam_32.pdb $(LIBS) /EXPORT:RegisterModule oleaut32.lib $(CP) $(OBJDIR)$(PS)mod_iis_openam_32.dll $(OBJDIR)$(PS)dist $(CP) $(OBJDIR)$(PS)mod_iis_openam_32.pdb $(OBJDIR)$(PS)dist From 7b186a5c5b3e546f9f60353321d4ea1363bd3eae Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 10 Jul 2018 18:03:59 +0300 Subject: [PATCH 091/212] i --- Makefile.windows.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 77b31bff4..1fe45e166 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -130,8 +130,8 @@ iis32: $(OUT_OBJS) $(IIS_OUT_OBJS) $(SED) -e "s$(SUB)_FILE_NAME_$(SUB)mod_iis_openam_32.dll$(SUB)g" \ -e "s$(SUB)_FILE_TYPE_$(SUB)VFT_DLL$(SUB)g" source/version.rc.template >> $(OBJDIR)/version.rc $(RC) /l 0x0409 /nologo /fo $(OBJDIR)$(PS)version.res $(OBJDIR)$(PS)version.rc - $(LINK32) $(SHARED) - #/LIBPATH:"$(LIB32_SDK)\x86" /LIBPATH:"$(LIB32_VC)\LIB" $(LDFLAGS) $(OUT_OBJS) $(IIS_OUT_OBJS) $(OBJDIR)/version.res /OUT:build/mod_iis_openam_32.dll /PDB:build/mod_iis_openam_32.pdb $(LIBS) /EXPORT:RegisterModule oleaut32.lib + $(LINK32) $(SHARED) /LIBPATH:"$(LIB32_SDK)\x86" + #/LIBPATH:"$(LIB32_VC)\LIB" $(LDFLAGS) $(OUT_OBJS) $(IIS_OUT_OBJS) $(OBJDIR)/version.res /OUT:build/mod_iis_openam_32.dll /PDB:build/mod_iis_openam_32.pdb $(LIBS) /EXPORT:RegisterModule oleaut32.lib $(CP) $(OBJDIR)$(PS)mod_iis_openam_32.dll $(OBJDIR)$(PS)dist $(CP) $(OBJDIR)$(PS)mod_iis_openam_32.pdb $(OBJDIR)$(PS)dist From 7d8a3885e2018248bbd842d197d1ba61e8a64c88 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 10 Jul 2018 18:07:27 +0300 Subject: [PATCH 092/212] i --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 1fe45e166..8450c7fde 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -130,7 +130,7 @@ iis32: $(OUT_OBJS) $(IIS_OUT_OBJS) $(SED) -e "s$(SUB)_FILE_NAME_$(SUB)mod_iis_openam_32.dll$(SUB)g" \ -e "s$(SUB)_FILE_TYPE_$(SUB)VFT_DLL$(SUB)g" source/version.rc.template >> $(OBJDIR)/version.rc $(RC) /l 0x0409 /nologo /fo $(OBJDIR)$(PS)version.res $(OBJDIR)$(PS)version.rc - $(LINK32) $(SHARED) /LIBPATH:"$(LIB32_SDK)\x86" + $(LINK32) $(SHARED) /LIBPATH:\"$(LIB32_SDK)\x86\" #/LIBPATH:"$(LIB32_VC)\LIB" $(LDFLAGS) $(OUT_OBJS) $(IIS_OUT_OBJS) $(OBJDIR)/version.res /OUT:build/mod_iis_openam_32.dll /PDB:build/mod_iis_openam_32.pdb $(LIBS) /EXPORT:RegisterModule oleaut32.lib $(CP) $(OBJDIR)$(PS)mod_iis_openam_32.dll $(OBJDIR)$(PS)dist $(CP) $(OBJDIR)$(PS)mod_iis_openam_32.pdb $(OBJDIR)$(PS)dist From c8eb9c5fae3190ddeb929d54e8a53dbd514835c0 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 10 Jul 2018 18:11:01 +0300 Subject: [PATCH 093/212] i --- Makefile.windows.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 8450c7fde..0b83a2a30 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -79,7 +79,7 @@ endif CC32:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\cl.exe #LINK32:=$(shell cygpath "$(LINK32)") LINK32 :=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\link.exe -LIB32_VC:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC +LIB32_VC:=C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC libopenam: $(OUT_OBJS) @$(ECHO) "[*** Creating "$@" shared library ***]" @@ -130,8 +130,8 @@ iis32: $(OUT_OBJS) $(IIS_OUT_OBJS) $(SED) -e "s$(SUB)_FILE_NAME_$(SUB)mod_iis_openam_32.dll$(SUB)g" \ -e "s$(SUB)_FILE_TYPE_$(SUB)VFT_DLL$(SUB)g" source/version.rc.template >> $(OBJDIR)/version.rc $(RC) /l 0x0409 /nologo /fo $(OBJDIR)$(PS)version.res $(OBJDIR)$(PS)version.rc - $(LINK32) $(SHARED) /LIBPATH:\"$(LIB32_SDK)\x86\" - #/LIBPATH:"$(LIB32_VC)\LIB" $(LDFLAGS) $(OUT_OBJS) $(IIS_OUT_OBJS) $(OBJDIR)/version.res /OUT:build/mod_iis_openam_32.dll /PDB:build/mod_iis_openam_32.pdb $(LIBS) /EXPORT:RegisterModule oleaut32.lib + $(LINK32) $(SHARED) /LIBPATH:\"$(LIB32_SDK)\x86\" /LIBPATH:\"$(LIB32_VC)\LIB\" + #$(LDFLAGS) $(OUT_OBJS) $(IIS_OUT_OBJS) $(OBJDIR)/version.res /OUT:build/mod_iis_openam_32.dll /PDB:build/mod_iis_openam_32.pdb $(LIBS) /EXPORT:RegisterModule oleaut32.lib $(CP) $(OBJDIR)$(PS)mod_iis_openam_32.dll $(OBJDIR)$(PS)dist $(CP) $(OBJDIR)$(PS)mod_iis_openam_32.pdb $(OBJDIR)$(PS)dist From 2eb2bfe714b5bfa4a3bf80d2f3fcec362d2d5aa5 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 10 Jul 2018 18:13:57 +0300 Subject: [PATCH 094/212] i --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 0b83a2a30..931240ac1 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -79,7 +79,7 @@ endif CC32:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\cl.exe #LINK32:=$(shell cygpath "$(LINK32)") LINK32 :=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\link.exe -LIB32_VC:=C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC +LIB32_VC:=C:\Program Files \(x86\)\Microsoft Visual Studio 14.0\VC libopenam: $(OUT_OBJS) @$(ECHO) "[*** Creating "$@" shared library ***]" From 1dcaf395dcca16be6645d81e5da5ebc6b19d0c28 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 10 Jul 2018 18:29:58 +0300 Subject: [PATCH 095/212] i --- Makefile.windows.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 931240ac1..69b830f84 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -130,8 +130,7 @@ iis32: $(OUT_OBJS) $(IIS_OUT_OBJS) $(SED) -e "s$(SUB)_FILE_NAME_$(SUB)mod_iis_openam_32.dll$(SUB)g" \ -e "s$(SUB)_FILE_TYPE_$(SUB)VFT_DLL$(SUB)g" source/version.rc.template >> $(OBJDIR)/version.rc $(RC) /l 0x0409 /nologo /fo $(OBJDIR)$(PS)version.res $(OBJDIR)$(PS)version.rc - $(LINK32) $(SHARED) /LIBPATH:\"$(LIB32_SDK)\x86\" /LIBPATH:\"$(LIB32_VC)\LIB\" - #$(LDFLAGS) $(OUT_OBJS) $(IIS_OUT_OBJS) $(OBJDIR)/version.res /OUT:build/mod_iis_openam_32.dll /PDB:build/mod_iis_openam_32.pdb $(LIBS) /EXPORT:RegisterModule oleaut32.lib + $(LINK32) $(SHARED) /LIBPATH:\"$(LIB32_SDK)\x86\" /LIBPATH:\"$(LIB32_VC)\LIB\" $(LDFLAGS) $(OUT_OBJS) $(IIS_OUT_OBJS) $(OBJDIR)/version.res /OUT:build/mod_iis_openam_32.dll /PDB:build/mod_iis_openam_32.pdb $(LIBS) /EXPORT:RegisterModule oleaut32.lib $(CP) $(OBJDIR)$(PS)mod_iis_openam_32.dll $(OBJDIR)$(PS)dist $(CP) $(OBJDIR)$(PS)mod_iis_openam_32.pdb $(OBJDIR)$(PS)dist From 29de128728d89c51327baa357b444f6f100216cd Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 10 Jul 2018 20:27:04 +0300 Subject: [PATCH 096/212] i --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 69b830f84..d99328ca5 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -79,7 +79,7 @@ endif CC32:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\cl.exe #LINK32:=$(shell cygpath "$(LINK32)") LINK32 :=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\link.exe -LIB32_VC:=C:\Program Files \(x86\)\Microsoft Visual Studio 14.0\VC +LIB32_VC:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC libopenam: $(OUT_OBJS) @$(ECHO) "[*** Creating "$@" shared library ***]" From 416fabfe9aec973989ed7792e801b00b4495aaa9 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 10 Jul 2018 20:46:42 +0300 Subject: [PATCH 097/212] i --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index d99328ca5..670fec555 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -80,7 +80,7 @@ CC32:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\cl.exe #LINK32:=$(shell cygpath "$(LINK32)") LINK32 :=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\link.exe LIB32_VC:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC - +LIB32_SDK:=C:\Program\ Files\ \(x86\)\Windows\ Kits\10\Extension\ SDKs\WindowsMobile\10.0.10240.0\Lib\um\x86 libopenam: $(OUT_OBJS) @$(ECHO) "[*** Creating "$@" shared library ***]" -$(RMALL) $(OBJDIR)$(PS)version.* From 12b61eb104473804ac34e6747e26fbc580053512 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 10 Jul 2018 22:46:11 +0300 Subject: [PATCH 098/212] i --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7f1f4f31d..18de55698 100644 --- a/Makefile +++ b/Makefile @@ -38,7 +38,7 @@ ifneq ("$(PROGRAMFILES)$(ProgramFiles)","") SED := sed ECHO := echo MKDIR := cmd /c mkdir - CP := cmd /c copy /E /Y + CP := cp -r CD := cd CAT :=cat EXEC := From 893623b6d0261ce9b74b9eeaa45607f24c5c2f6b Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 10 Jul 2018 22:52:23 +0300 Subject: [PATCH 099/212] i --- Makefile.windows.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 670fec555..06c7067bc 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -180,8 +180,8 @@ agentadmin_iis: $(OUT_OBJS) $(ADMIN_OUT_OBJS) -e "s$(SUB)DESCRIPTION$(SUB)\"OpenAM Web Agent Administration Utility\"$(SUB)g" \ -e "s$(SUB)_FILE_TYPE_$(SUB)VFT_APP$(SUB)g" < source$(PS)version.rc.template > $(OBJDIR)$(PS)version.rc $(RC) /l 0x0409 /nologo /fo $(OBJDIR)$(PS)version.res $(OBJDIR)$(PS)version.rc - "${LINK32}" /LIBPATH:"$(LIB32_SDK)\x86" /LIBPATH:"$(LIB32_VC)\LIB" $(LDFLAGS) $(OUT_OBJS) \ - $(ADMIN_OUT_OBJS) $(OBJDIR)$(PS)version.res /OUT:build\agentadmin.exe /PDB:build\agentadmin.pdb \ + ${LINK32} /LIBPATH:"$(LIB32_SDK)\x86" /LIBPATH:"$(LIB32_VC)\LIB" $(LDFLAGS) $(OUT_OBJS) \ + $(ADMIN_OUT_OBJS) $(OBJDIR)\version.res /OUT:build\agentadmin.exe /PDB:build\agentadmin.pdb \ $(LIBS) ole32.lib oleaut32.lib ahadmin.lib $(CP) $(OBJDIR)$(PS)agentadmin.pdb $(OBJDIR)$(PS)dist $(CP) $(OBJDIR)$(PS)agentadmin.exe $(OBJDIR)$(PS)dist From 73b3deed9a585abff8704457589345e1a2e525d3 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 10 Jul 2018 22:56:43 +0300 Subject: [PATCH 100/212] i --- Makefile.windows.mk | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 06c7067bc..c3781c30d 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -149,8 +149,7 @@ iis64: $(OUT_OBJS_64) $(IIS_OUT_OBJS_64) $(SED) -e "s$(SUB)_FILE_NAME_$(SUB)mod_iis_openam_64.dll$(SUB)g" \ -e "s$(SUB)_FILE_TYPE_$(SUB)VFT_DLL$(SUB)g" < source$(PS)version.rc.template > $(OBJDIR)$(PS)version.rc $(RC) /l 0x0409 /nologo /fo $(OBJDIR)$(PS)version.res $(OBJDIR)$(PS)version.rc - ${LINK} $(SHARED) $(LDFLAGS) $(OUT_OBJS_64) $(IIS_OUT_OBJS_64) $(OBJDIR)$(PS)version.res /OUT:build\mod_iis_openam_64.dll \ - /PDB:build\mod_iis_openam_64.pdb $(LIBS) /EXPORT:RegisterModule oleaut32.lib + ${LINK} $(SHARED) $(LDFLAGS) $(OUT_OBJS_64) $(IIS_OUT_OBJS_64) $(OBJDIR)\version.res /OUT:build\mod_iis_openam_64.dll /PDB:build\mod_iis_openam_64.pdb $(LIBS) /EXPORT:RegisterModule oleaut32.lib $(CP) $(OBJDIR)$(PS)mod_iis_openam_64.dll $(OBJDIR)$(PS)dist $(CP) $(OBJDIR)$(PS)mod_iis_openam_64.pdb $(OBJDIR)$(PS)dist $(CP) $(OBJDIR)$(PS)dist$(PS)agentadmin.exe $(OBJDIR)$(PS) @@ -168,8 +167,7 @@ agentadmin: $(OUT_OBJS) $(ADMIN_OUT_OBJS) -e "s$(SUB)DESCRIPTION$(SUB)\"OpenAM Web Agent Administration Utility\"$(SUB)g" \ -e "s$(SUB)_FILE_TYPE_$(SUB)VFT_APP$(SUB)g" < source$(PS)version.rc.template > $(OBJDIR)$(PS)version.rc $(RC) /l 0x0409 /nologo /fo $(OBJDIR)$(PS)version.res $(OBJDIR)$(PS)version.rc - ${LINK} $(LDFLAGS) $(OUT_OBJS) $(ADMIN_OUT_OBJS) $(OBJDIR)$(PS)version.res /OUT:build\$@.exe /PDB:build\$@.pdb \ - $(LIBS) ole32.lib oleaut32.lib ahadmin.lib + ${LINK} $(LDFLAGS) $(OUT_OBJS) $(ADMIN_OUT_OBJS) $(OBJDIR)$(PS)version.res /OUT:build\$@.exe /PDB:build\$@.pdb $(LIBS) ole32.lib oleaut32.lib ahadmin.lib agentadmin_iis: CC = $(CC32) agentadmin_iis: LDFLAGS += /MACHINE:X86 @@ -180,9 +178,7 @@ agentadmin_iis: $(OUT_OBJS) $(ADMIN_OUT_OBJS) -e "s$(SUB)DESCRIPTION$(SUB)\"OpenAM Web Agent Administration Utility\"$(SUB)g" \ -e "s$(SUB)_FILE_TYPE_$(SUB)VFT_APP$(SUB)g" < source$(PS)version.rc.template > $(OBJDIR)$(PS)version.rc $(RC) /l 0x0409 /nologo /fo $(OBJDIR)$(PS)version.res $(OBJDIR)$(PS)version.rc - ${LINK32} /LIBPATH:"$(LIB32_SDK)\x86" /LIBPATH:"$(LIB32_VC)\LIB" $(LDFLAGS) $(OUT_OBJS) \ - $(ADMIN_OUT_OBJS) $(OBJDIR)\version.res /OUT:build\agentadmin.exe /PDB:build\agentadmin.pdb \ - $(LIBS) ole32.lib oleaut32.lib ahadmin.lib + ${LINK32} /LIBPATH:"$(LIB32_SDK)\x86" /LIBPATH:"$(LIB32_VC)\LIB" $(LDFLAGS) $(OUT_OBJS) $(ADMIN_OUT_OBJS) $(OBJDIR)\version.res /OUT:build\agentadmin.exe /PDB:build\agentadmin.pdb $(LIBS) ole32.lib oleaut32.lib ahadmin.lib $(CP) $(OBJDIR)$(PS)agentadmin.pdb $(OBJDIR)$(PS)dist $(CP) $(OBJDIR)$(PS)agentadmin.exe $(OBJDIR)$(PS)dist From 734ce018217c7957affe3b4edcdcca119a16af14 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 10 Jul 2018 22:59:43 +0300 Subject: [PATCH 101/212] i --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index c3781c30d..77abefc47 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -178,7 +178,7 @@ agentadmin_iis: $(OUT_OBJS) $(ADMIN_OUT_OBJS) -e "s$(SUB)DESCRIPTION$(SUB)\"OpenAM Web Agent Administration Utility\"$(SUB)g" \ -e "s$(SUB)_FILE_TYPE_$(SUB)VFT_APP$(SUB)g" < source$(PS)version.rc.template > $(OBJDIR)$(PS)version.rc $(RC) /l 0x0409 /nologo /fo $(OBJDIR)$(PS)version.res $(OBJDIR)$(PS)version.rc - ${LINK32} /LIBPATH:"$(LIB32_SDK)\x86" /LIBPATH:"$(LIB32_VC)\LIB" $(LDFLAGS) $(OUT_OBJS) $(ADMIN_OUT_OBJS) $(OBJDIR)\version.res /OUT:build\agentadmin.exe /PDB:build\agentadmin.pdb $(LIBS) ole32.lib oleaut32.lib ahadmin.lib + ${LINK32} /LIBPATH:\"$(LIB32_SDK)\x86\" /LIBPATH:\"$(LIB32_VC)\LIB\" $(LDFLAGS) $(OUT_OBJS) $(ADMIN_OUT_OBJS) $(OBJDIR)\version.res /OUT:build\agentadmin.exe /PDB:build\agentadmin.pdb $(LIBS) ole32.lib oleaut32.lib ahadmin.lib $(CP) $(OBJDIR)$(PS)agentadmin.pdb $(OBJDIR)$(PS)dist $(CP) $(OBJDIR)$(PS)agentadmin.exe $(OBJDIR)$(PS)dist From 439ac6e326d5ef9b645f8b401a74301c9ff7a221 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 10 Jul 2018 23:52:43 +0300 Subject: [PATCH 102/212] i --- Makefile.windows.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 77abefc47..9f4f71177 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -71,16 +71,11 @@ else CFLAGS += /MT endif -#CC32 := cl -#LINK32 :=link -#CC32:="$(shell cygpath "$(CC32)")" -#CC32:="/c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio\ 14.0/VC/BIN/cl.exe" -#CC32:="$(CC32)" CC32:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\cl.exe -#LINK32:=$(shell cygpath "$(LINK32)") LINK32 :=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\link.exe LIB32_VC:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC LIB32_SDK:=C:\Program\ Files\ \(x86\)\Windows\ Kits\10\Extension\ SDKs\WindowsMobile\10.0.10240.0\Lib\um\x86 + libopenam: $(OUT_OBJS) @$(ECHO) "[*** Creating "$@" shared library ***]" -$(RMALL) $(OBJDIR)$(PS)version.* @@ -121,7 +116,7 @@ iisclean: -$(RMALL) $(OBJDIR)$(PS)zlib$(PS)* -$(RMALL) $(OBJDIR)$(PS)source$(PS)* -$(RMALL) $(OBJDIR)$(PS)source$(PS)iis$(PS)* - +iis32: "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86 iis32: CC = $(CC32) iis32: LDFLAGS += /MACHINE:X86 iis32: $(OUT_OBJS) $(IIS_OUT_OBJS) From a18bb94f4984bc7bce4280766c0d71844782a62b Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Wed, 11 Jul 2018 00:03:23 +0300 Subject: [PATCH 103/212] i --- Makefile.windows.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 9f4f71177..b490ac5ee 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -75,6 +75,8 @@ CC32:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\cl.exe LINK32 :=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\link.exe LIB32_VC:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC LIB32_SDK:=C:\Program\ Files\ \(x86\)\Windows\ Kits\10\Extension\ SDKs\WindowsMobile\10.0.10240.0\Lib\um\x86 +CC=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\x64\bin\cl.exe +LINK=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\link.exe libopenam: $(OUT_OBJS) @$(ECHO) "[*** Creating "$@" shared library ***]" @@ -116,7 +118,6 @@ iisclean: -$(RMALL) $(OBJDIR)$(PS)zlib$(PS)* -$(RMALL) $(OBJDIR)$(PS)source$(PS)* -$(RMALL) $(OBJDIR)$(PS)source$(PS)iis$(PS)* -iis32: "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86 iis32: CC = $(CC32) iis32: LDFLAGS += /MACHINE:X86 iis32: $(OUT_OBJS) $(IIS_OUT_OBJS) From c6178302e78c061298807cfa3d6a51ab6e6a5284 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Wed, 11 Jul 2018 00:09:46 +0300 Subject: [PATCH 104/212] i --- Makefile.windows.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index b490ac5ee..fa7ef884e 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -75,8 +75,8 @@ CC32:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\cl.exe LINK32 :=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\link.exe LIB32_VC:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC LIB32_SDK:=C:\Program\ Files\ \(x86\)\Windows\ Kits\10\Extension\ SDKs\WindowsMobile\10.0.10240.0\Lib\um\x86 -CC=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\x64\bin\cl.exe -LINK=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\link.exe +CC=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\x86_amd64\cl.exe +LINK=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\x86_amd64\link.exe libopenam: $(OUT_OBJS) @$(ECHO) "[*** Creating "$@" shared library ***]" @@ -112,7 +112,7 @@ apache22: apache22_pre $(OUT_OBJS) $(APACHE22_OUT_OBJS) apache22_post iis: iis32 agentadmin_iis iisclean iis64 iisclean: - -$(RMALL) $(OBJDIR)$(PS)* + -$(RMALL) $(OBJDIR)/* -$(RMALL) $(OBJDIR)$(PS)expat$(PS)* -$(RMALL) $(OBJDIR)$(PS)pcre$(PS)* -$(RMALL) $(OBJDIR)$(PS)zlib$(PS)* From 11565368fae07e537af35e2bfc467629478874ce Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Wed, 11 Jul 2018 00:15:49 +0300 Subject: [PATCH 105/212] i --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index fa7ef884e..c693aa35d 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -112,7 +112,7 @@ apache22: apache22_pre $(OUT_OBJS) $(APACHE22_OUT_OBJS) apache22_post iis: iis32 agentadmin_iis iisclean iis64 iisclean: - -$(RMALL) $(OBJDIR)/* + -$(RMALL) $(OBJDIR)$(PS)* -$(RMALL) $(OBJDIR)$(PS)expat$(PS)* -$(RMALL) $(OBJDIR)$(PS)pcre$(PS)* -$(RMALL) $(OBJDIR)$(PS)zlib$(PS)* From 6472b12e263fa18ef1918ec9dd20bc9b8d9fc02e Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Thu, 12 Jul 2018 15:42:30 +0300 Subject: [PATCH 106/212] i --- Makefile.windows.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index c693aa35d..8e1e47f51 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -109,7 +109,12 @@ apache22: apache22_pre $(OUT_OBJS) $(APACHE22_OUT_OBJS) apache22_post extlib/$(OS_ARCH)$(OS_MARCH)/apache22/lib/libapr-1.lib extlib/$(OS_ARCH)$(OS_MARCH)/apache22/lib/libaprutil-1.lib \ extlib/$(OS_ARCH)$(OS_MARCH)/apache22/lib/libhttpd.lib -iis: iis32 agentadmin_iis iisclean iis64 +iis: x32 iis32 agentadmin_iis iisclean x64 iis64 + +x32: + "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86 +x64: + "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_amd64 iisclean: -$(RMALL) $(OBJDIR)$(PS)* From e86a0e832e17bb4fd98e3fd8cb34fa54f5a46247 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Thu, 12 Jul 2018 15:44:25 +0300 Subject: [PATCH 107/212] i --- Makefile.windows.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 8e1e47f51..14e2d6611 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -112,9 +112,9 @@ apache22: apache22_pre $(OUT_OBJS) $(APACHE22_OUT_OBJS) apache22_post iis: x32 iis32 agentadmin_iis iisclean x64 iis64 x32: - "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86 + cmd -c "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86 x64: - "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_amd64 + cmd -c "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_amd64 iisclean: -$(RMALL) $(OBJDIR)$(PS)* From 9f28b91d6275114f9f10af422c60d1f9f8330854 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Thu, 12 Jul 2018 15:46:08 +0300 Subject: [PATCH 108/212] i --- Makefile.windows.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 14e2d6611..af2ce5198 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -112,9 +112,9 @@ apache22: apache22_pre $(OUT_OBJS) $(APACHE22_OUT_OBJS) apache22_post iis: x32 iis32 agentadmin_iis iisclean x64 iis64 x32: - cmd -c "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86 + "C:\Program Files \(x86\)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86 x64: - cmd -c "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_amd64 + "C:\Program Files \(x86\)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_amd64 iisclean: -$(RMALL) $(OBJDIR)$(PS)* From 4017aa4ddea321278801403fcb95307468848e08 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Thu, 12 Jul 2018 15:48:35 +0300 Subject: [PATCH 109/212] i --- Makefile.windows.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index af2ce5198..e258f0056 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -112,9 +112,9 @@ apache22: apache22_pre $(OUT_OBJS) $(APACHE22_OUT_OBJS) apache22_post iis: x32 iis32 agentadmin_iis iisclean x64 iis64 x32: - "C:\Program Files \(x86\)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86 + C:\Program Files \(x86\)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat x86 x64: - "C:\Program Files \(x86\)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_amd64 + C:\Program Files \(x86\)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat x86_amd64 iisclean: -$(RMALL) $(OBJDIR)$(PS)* From 5bdcb0aaf5691bf4cd679e058d0874672a07beb4 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Thu, 12 Jul 2018 15:52:51 +0300 Subject: [PATCH 110/212] i --- Makefile.windows.mk | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index e258f0056..ec466c67a 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -13,6 +13,7 @@ # # Copyright 2014 - 2016 ForgeRock AS. # +C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\vcvarsall.bat x86 ifndef WINDOWS_MK_INCLUDED WINDOWS_MK_INCLUDED := true @@ -109,12 +110,10 @@ apache22: apache22_pre $(OUT_OBJS) $(APACHE22_OUT_OBJS) apache22_post extlib/$(OS_ARCH)$(OS_MARCH)/apache22/lib/libapr-1.lib extlib/$(OS_ARCH)$(OS_MARCH)/apache22/lib/libaprutil-1.lib \ extlib/$(OS_ARCH)$(OS_MARCH)/apache22/lib/libhttpd.lib -iis: x32 iis32 agentadmin_iis iisclean x64 iis64 +iis: iis32 agentadmin_iis iisclean x64 iis64 -x32: - C:\Program Files \(x86\)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat x86 x64: - C:\Program Files \(x86\)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat x86_amd64 + C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\vcvarsall.bat x86_amd64 iisclean: -$(RMALL) $(OBJDIR)$(PS)* From 0c8bd66bee81674c5df2831d16f369802e99683a Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Thu, 12 Jul 2018 15:57:15 +0300 Subject: [PATCH 111/212] i --- Makefile.windows.mk | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index ec466c67a..cbb329174 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -13,7 +13,6 @@ # # Copyright 2014 - 2016 ForgeRock AS. # -C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\vcvarsall.bat x86 ifndef WINDOWS_MK_INCLUDED WINDOWS_MK_INCLUDED := true @@ -110,18 +109,19 @@ apache22: apache22_pre $(OUT_OBJS) $(APACHE22_OUT_OBJS) apache22_post extlib/$(OS_ARCH)$(OS_MARCH)/apache22/lib/libapr-1.lib extlib/$(OS_ARCH)$(OS_MARCH)/apache22/lib/libaprutil-1.lib \ extlib/$(OS_ARCH)$(OS_MARCH)/apache22/lib/libhttpd.lib -iis: iis32 agentadmin_iis iisclean x64 iis64 - +x32: + C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\vcvarsall.bat x86 x64: C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\vcvarsall.bat x86_amd64 +iis: x32 iis32 agentadmin_iis iisclean x64 iis64 iisclean: - -$(RMALL) $(OBJDIR)$(PS)* - -$(RMALL) $(OBJDIR)$(PS)expat$(PS)* - -$(RMALL) $(OBJDIR)$(PS)pcre$(PS)* - -$(RMALL) $(OBJDIR)$(PS)zlib$(PS)* - -$(RMALL) $(OBJDIR)$(PS)source$(PS)* - -$(RMALL) $(OBJDIR)$(PS)source$(PS)iis$(PS)* + -$(RMALL) $(OBJDIR)/*.* + -$(RMALL) $(OBJDIR)/expat/* + -$(RMALL) $(OBJDIR)/pcre/* + -$(RMALL) $(OBJDIR)/zlib/* + -$(RMALL) $(OBJDIR)/source/* + -$(RMALL) $(OBJDIR)/source/iis/* iis32: CC = $(CC32) iis32: LDFLAGS += /MACHINE:X86 iis32: $(OUT_OBJS) $(IIS_OUT_OBJS) From 798d03a9baf598c9ec6a115a9b582297ef50819e Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Thu, 12 Jul 2018 18:20:38 +0300 Subject: [PATCH 112/212] i --- Makefile.windows.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index cbb329174..96a8fb02d 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -112,7 +112,9 @@ apache22: apache22_pre $(OUT_OBJS) $(APACHE22_OUT_OBJS) apache22_post x32: C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\vcvarsall.bat x86 x64: + C:\Program\ Files\Microsoft\ SDKs\Windows\v7.1\Bin\SetEnv.cmd /x64 C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\vcvarsall.bat x86_amd64 + iis: x32 iis32 agentadmin_iis iisclean x64 iis64 iisclean: From 8f570a18dac78b5b96e90c47a7d88226bf44f5b5 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Thu, 12 Jul 2018 18:24:26 +0300 Subject: [PATCH 113/212] i --- Makefile.windows.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 96a8fb02d..fe47a4887 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -111,6 +111,7 @@ apache22: apache22_pre $(OUT_OBJS) $(APACHE22_OUT_OBJS) apache22_post x32: C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\vcvarsall.bat x86 + set x64: C:\Program\ Files\Microsoft\ SDKs\Windows\v7.1\Bin\SetEnv.cmd /x64 C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\vcvarsall.bat x86_amd64 From ab750aef42feeab4a66309e984b251e90fd70d8f Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Thu, 12 Jul 2018 18:32:30 +0300 Subject: [PATCH 114/212] i --- Makefile.windows.mk | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index fe47a4887..9f65b5256 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -14,6 +14,8 @@ # Copyright 2014 - 2016 ForgeRock AS. # +res32 := $(shell 'C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\vcvarsall.bat x86') + ifndef WINDOWS_MK_INCLUDED WINDOWS_MK_INCLUDED := true @@ -109,14 +111,11 @@ apache22: apache22_pre $(OUT_OBJS) $(APACHE22_OUT_OBJS) apache22_post extlib/$(OS_ARCH)$(OS_MARCH)/apache22/lib/libapr-1.lib extlib/$(OS_ARCH)$(OS_MARCH)/apache22/lib/libaprutil-1.lib \ extlib/$(OS_ARCH)$(OS_MARCH)/apache22/lib/libhttpd.lib -x32: - C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\vcvarsall.bat x86 - set x64: C:\Program\ Files\Microsoft\ SDKs\Windows\v7.1\Bin\SetEnv.cmd /x64 C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\vcvarsall.bat x86_amd64 -iis: x32 iis32 agentadmin_iis iisclean x64 iis64 +iis: iis32 agentadmin_iis iisclean x64 iis64 iisclean: -$(RMALL) $(OBJDIR)/*.* From fe73c6c5f66080a810ad0c05e64be9bc2527eb54 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Thu, 12 Jul 2018 18:34:30 +0300 Subject: [PATCH 115/212] i --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 9f65b5256..c163c1f39 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -14,7 +14,7 @@ # Copyright 2014 - 2016 ForgeRock AS. # -res32 := $(shell 'C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\vcvarsall.bat x86') +res32 := $(shell 'C:\Program Files \(x86\)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat x86') ifndef WINDOWS_MK_INCLUDED WINDOWS_MK_INCLUDED := true From 516553f5aeb919b61f0bac280c3d5e2f8c2f4f21 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Thu, 12 Jul 2018 18:37:23 +0300 Subject: [PATCH 116/212] i --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index c163c1f39..a73d12634 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -14,7 +14,7 @@ # Copyright 2014 - 2016 ForgeRock AS. # -res32 := $(shell 'C:\Program Files \(x86\)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat x86') +res32 := $(shell 'C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat x86') ifndef WINDOWS_MK_INCLUDED WINDOWS_MK_INCLUDED := true From fbdd9c055a11d84103cee1121bb97ec2ff66e15d Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Thu, 12 Jul 2018 18:38:59 +0300 Subject: [PATCH 117/212] i --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index a73d12634..70115bf58 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -14,7 +14,7 @@ # Copyright 2014 - 2016 ForgeRock AS. # -res32 := $(shell 'C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat x86') +res32 := $(shell '"C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86') ifndef WINDOWS_MK_INCLUDED WINDOWS_MK_INCLUDED := true From 91de910a210b417d18a8838f687911cbaf540703 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Thu, 12 Jul 2018 18:41:09 +0300 Subject: [PATCH 118/212] i --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 70115bf58..1036dd8f5 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -14,7 +14,7 @@ # Copyright 2014 - 2016 ForgeRock AS. # -res32 := $(shell '"C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86') +res32 := $(shell 'call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86') ifndef WINDOWS_MK_INCLUDED WINDOWS_MK_INCLUDED := true From 73901e463b10b12f88fb3566807ac4d2298b4962 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Thu, 12 Jul 2018 18:42:33 +0300 Subject: [PATCH 119/212] i --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 1036dd8f5..6eee40f94 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -14,7 +14,7 @@ # Copyright 2014 - 2016 ForgeRock AS. # -res32 := $(shell 'call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86') +res32 := $(shell '"C:\Program Files \(x86\)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86') ifndef WINDOWS_MK_INCLUDED WINDOWS_MK_INCLUDED := true From d8a94de79f367d424406712837f9e8edcf5c3679 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Thu, 12 Jul 2018 18:45:13 +0300 Subject: [PATCH 120/212] i --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 6eee40f94..2dd41a30e 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -14,7 +14,7 @@ # Copyright 2014 - 2016 ForgeRock AS. # -res32 := $(shell '"C:\Program Files \(x86\)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86') +res32 := $(shell cmd '"C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86') ifndef WINDOWS_MK_INCLUDED WINDOWS_MK_INCLUDED := true From 15598d8114df6c1fe30751da33ac06b45c81d587 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Thu, 12 Jul 2018 18:56:22 +0300 Subject: [PATCH 121/212] i --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 2dd41a30e..5072a2ca9 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -14,7 +14,7 @@ # Copyright 2014 - 2016 ForgeRock AS. # -res32 := $(shell cmd '"C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86') +res32 := $(shell 'cmd /c "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86') ifndef WINDOWS_MK_INCLUDED WINDOWS_MK_INCLUDED := true From 2c491dd81b70830f6adcd830a00f0eed870336f5 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Thu, 12 Jul 2018 18:57:48 +0300 Subject: [PATCH 122/212] i --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 5072a2ca9..d8c790d38 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -14,7 +14,7 @@ # Copyright 2014 - 2016 ForgeRock AS. # -res32 := $(shell 'cmd /c "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86') +res32 := $(shell 'cmd /c "C:\Program Files \(x86\)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86') ifndef WINDOWS_MK_INCLUDED WINDOWS_MK_INCLUDED := true From 3b2fa03c48e0eca8de90fa9880edfeefc1720bb1 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Thu, 12 Jul 2018 18:59:44 +0300 Subject: [PATCH 123/212] i --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index d8c790d38..24e70159f 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -14,7 +14,7 @@ # Copyright 2014 - 2016 ForgeRock AS. # -res32 := $(shell 'cmd /c "C:\Program Files \(x86\)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86') +res32 := $(shell 'cmd /c "\"C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat\" x86"') ifndef WINDOWS_MK_INCLUDED WINDOWS_MK_INCLUDED := true From 2cea293ad9591e9d93bfe8ba01d532c6ba288d84 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 17 Jul 2018 20:58:52 +0300 Subject: [PATCH 124/212] i --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 24e70159f..9f7c9b625 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -14,7 +14,7 @@ # Copyright 2014 - 2016 ForgeRock AS. # -res32 := $(shell 'cmd /c "\"C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat\" x86"') +res32 := $(shell cmd /c "\"C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat\" x86") ifndef WINDOWS_MK_INCLUDED WINDOWS_MK_INCLUDED := true From 212465cc68a2c140982c7429679bea4fda01f04f Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Mon, 23 Jul 2018 20:09:15 +0300 Subject: [PATCH 125/212] i --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 9f7c9b625..8c63a1523 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -14,7 +14,7 @@ # Copyright 2014 - 2016 ForgeRock AS. # -res32 := $(shell cmd /c "\"C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat\" x86") +res32 := $(shell cmd /c '"C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86') ifndef WINDOWS_MK_INCLUDED WINDOWS_MK_INCLUDED := true From ff85a3503664e2ca4e604588a300d675956cf5d6 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Mon, 23 Jul 2018 20:11:40 +0300 Subject: [PATCH 126/212] i --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 8c63a1523..a1e284e03 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -14,7 +14,7 @@ # Copyright 2014 - 2016 ForgeRock AS. # -res32 := $(shell cmd /c '"C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86') +res32 := $(shell powershell '"C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86') ifndef WINDOWS_MK_INCLUDED WINDOWS_MK_INCLUDED := true From 82dad587dfb408d29f7f78b8f618b6b6b41c463f Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Mon, 23 Jul 2018 21:33:12 +0300 Subject: [PATCH 127/212] i --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index a1e284e03..967dde2df 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -14,7 +14,7 @@ # Copyright 2014 - 2016 ForgeRock AS. # -res32 := $(shell powershell '"C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86') +res32 := $(shell C:\\Program\ Files\ \(x86\)\\Microsoft\ Visual\ Studio\ 14.0\\VC\\vcvarsall.bat x86) ifndef WINDOWS_MK_INCLUDED WINDOWS_MK_INCLUDED := true From 38efc380f9e5d51e469f5142a5aefe162b5f99d6 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Mon, 23 Jul 2018 22:01:00 +0300 Subject: [PATCH 128/212] i --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 967dde2df..3d0d59697 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -13,7 +13,7 @@ # # Copyright 2014 - 2016 ForgeRock AS. # - +.EXPORT_ALL_VARIABLES res32 := $(shell C:\\Program\ Files\ \(x86\)\\Microsoft\ Visual\ Studio\ 14.0\\VC\\vcvarsall.bat x86) ifndef WINDOWS_MK_INCLUDED From e37aad42e98495798eb5efe2c0d15ab5df3dc64d Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Mon, 23 Jul 2018 22:01:54 +0300 Subject: [PATCH 129/212] i --- Makefile.windows.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 3d0d59697..cd6e11cdc 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -14,6 +14,7 @@ # Copyright 2014 - 2016 ForgeRock AS. # .EXPORT_ALL_VARIABLES + res32 := $(shell C:\\Program\ Files\ \(x86\)\\Microsoft\ Visual\ Studio\ 14.0\\VC\\vcvarsall.bat x86) ifndef WINDOWS_MK_INCLUDED From 86d4ddb793d6377bcdab88f48dd4de1d41b6c81e Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Mon, 23 Jul 2018 22:03:25 +0300 Subject: [PATCH 130/212] i --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index cd6e11cdc..e343f6e0b 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -13,7 +13,7 @@ # # Copyright 2014 - 2016 ForgeRock AS. # -.EXPORT_ALL_VARIABLES +.EXPORT_ALL_VARIABLES: res32 := $(shell C:\\Program\ Files\ \(x86\)\\Microsoft\ Visual\ Studio\ 14.0\\VC\\vcvarsall.bat x86) From a47163554dbc8c28ca414d94618a089c34a50074 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Mon, 23 Jul 2018 23:13:11 +0300 Subject: [PATCH 131/212] i --- Makefile.windows.mk | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index e343f6e0b..bd450a749 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -13,9 +13,6 @@ # # Copyright 2014 - 2016 ForgeRock AS. # -.EXPORT_ALL_VARIABLES: - -res32 := $(shell C:\\Program\ Files\ \(x86\)\\Microsoft\ Visual\ Studio\ 14.0\\VC\\vcvarsall.bat x86) ifndef WINDOWS_MK_INCLUDED WINDOWS_MK_INCLUDED := true @@ -74,7 +71,7 @@ else CFLAGS += /MT endif -CC32:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\cl.exe +CC32:=C:\\Program\ Files\ \(x86\)\\Microsoft\ Visual\ Studio\ 14.0\\VC\\vcvarsall.bat x86;cl.exe LINK32 :=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\link.exe LIB32_VC:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC LIB32_SDK:=C:\Program\ Files\ \(x86\)\Windows\ Kits\10\Extension\ SDKs\WindowsMobile\10.0.10240.0\Lib\um\x86 @@ -112,11 +109,7 @@ apache22: apache22_pre $(OUT_OBJS) $(APACHE22_OUT_OBJS) apache22_post extlib/$(OS_ARCH)$(OS_MARCH)/apache22/lib/libapr-1.lib extlib/$(OS_ARCH)$(OS_MARCH)/apache22/lib/libaprutil-1.lib \ extlib/$(OS_ARCH)$(OS_MARCH)/apache22/lib/libhttpd.lib -x64: - C:\Program\ Files\Microsoft\ SDKs\Windows\v7.1\Bin\SetEnv.cmd /x64 - C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\vcvarsall.bat x86_amd64 - -iis: iis32 agentadmin_iis iisclean x64 iis64 +iis: iis32 agentadmin_iis iisclean iis64 iisclean: -$(RMALL) $(OBJDIR)/*.* From 2766f5b23c6d99f6d890d9010e6c84325f4e0655 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Mon, 23 Jul 2018 23:15:35 +0300 Subject: [PATCH 132/212] i --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index bd450a749..9cb3860af 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -71,7 +71,7 @@ else CFLAGS += /MT endif -CC32:=C:\\Program\ Files\ \(x86\)\\Microsoft\ Visual\ Studio\ 14.0\\VC\\vcvarsall.bat x86;cl.exe +CC32:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\vcvarsall.bat x86; cl.exe LINK32 :=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\link.exe LIB32_VC:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC LIB32_SDK:=C:\Program\ Files\ \(x86\)\Windows\ Kits\10\Extension\ SDKs\WindowsMobile\10.0.10240.0\Lib\um\x86 From 010c98a731e013fcc4c108461e62b482dac33148 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Mon, 23 Jul 2018 23:17:54 +0300 Subject: [PATCH 133/212] i --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 9cb3860af..6af283ae1 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -71,7 +71,7 @@ else CFLAGS += /MT endif -CC32:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\vcvarsall.bat x86; cl.exe +CC32:="C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\vcvarsall.bat" x86; cl.exe LINK32 :=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\link.exe LIB32_VC:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC LIB32_SDK:=C:\Program\ Files\ \(x86\)\Windows\ Kits\10\Extension\ SDKs\WindowsMobile\10.0.10240.0\Lib\um\x86 From c5cd71fd4883157b6a04c27361c2bd4725c60f09 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Mon, 23 Jul 2018 23:20:00 +0300 Subject: [PATCH 134/212] i --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 6af283ae1..cb4d3534b 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -71,7 +71,7 @@ else CFLAGS += /MT endif -CC32:="C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\vcvarsall.bat" x86; cl.exe +CC32:="C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86; cl.exe LINK32 :=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\link.exe LIB32_VC:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC LIB32_SDK:=C:\Program\ Files\ \(x86\)\Windows\ Kits\10\Extension\ SDKs\WindowsMobile\10.0.10240.0\Lib\um\x86 From 86a4204a31f3f12bc5cbfc73c9b7e19c441b90ca Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Mon, 23 Jul 2018 23:28:10 +0300 Subject: [PATCH 135/212] i --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index cb4d3534b..c0d0d7f63 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -71,7 +71,7 @@ else CFLAGS += /MT endif -CC32:="C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86; cl.exe +CC32:= C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\vcvarsall.bat x86; cl.exe LINK32 :=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\link.exe LIB32_VC:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC LIB32_SDK:=C:\Program\ Files\ \(x86\)\Windows\ Kits\10\Extension\ SDKs\WindowsMobile\10.0.10240.0\Lib\um\x86 From 26829dc7283fd3c23300fb605c3bf672bc605584 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Mon, 23 Jul 2018 23:29:57 +0300 Subject: [PATCH 136/212] i --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index c0d0d7f63..51b562fe8 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -71,7 +71,7 @@ else CFLAGS += /MT endif -CC32:= C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\vcvarsall.bat x86; cl.exe +CC32:= C:\\Program\ Files\ \(x86\)\\Microsoft\ Visual\ Studio\ 14.0\\VC\\vcvarsall.bat x86; cl.exe LINK32 :=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\link.exe LIB32_VC:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC LIB32_SDK:=C:\Program\ Files\ \(x86\)\Windows\ Kits\10\Extension\ SDKs\WindowsMobile\10.0.10240.0\Lib\um\x86 From ec764b19af07ea51e7e01e08a7734c1c8563f814 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Mon, 23 Jul 2018 23:32:42 +0300 Subject: [PATCH 137/212] i --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 51b562fe8..f2bbfc3f1 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -71,7 +71,7 @@ else CFLAGS += /MT endif -CC32:= C:\\Program\ Files\ \(x86\)\\Microsoft\ Visual\ Studio\ 14.0\\VC\\vcvarsall.bat x86; cl.exe +CC32:= "C:\\Program\ Files\ \(x86\)\\Microsoft\ Visual\ Studio\ 14.0\\VC\\vcvarsall.bat" x86; cl.exe LINK32 :=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\link.exe LIB32_VC:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC LIB32_SDK:=C:\Program\ Files\ \(x86\)\Windows\ Kits\10\Extension\ SDKs\WindowsMobile\10.0.10240.0\Lib\um\x86 From 7a555aa5ba6f044b43bbbdf6b2326f80a100ee77 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Mon, 23 Jul 2018 23:35:08 +0300 Subject: [PATCH 138/212] i --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index f2bbfc3f1..33e4b5ea2 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -71,7 +71,7 @@ else CFLAGS += /MT endif -CC32:= "C:\\Program\ Files\ \(x86\)\\Microsoft\ Visual\ Studio\ 14.0\\VC\\vcvarsall.bat" x86; cl.exe +CC32:= call C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\vcvarsall.bat x86; cl.exe LINK32 :=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\link.exe LIB32_VC:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC LIB32_SDK:=C:\Program\ Files\ \(x86\)\Windows\ Kits\10\Extension\ SDKs\WindowsMobile\10.0.10240.0\Lib\um\x86 From d5ec4a0714970c8a93fa838b2cce30310599566c Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Mon, 23 Jul 2018 23:37:42 +0300 Subject: [PATCH 139/212] i --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 33e4b5ea2..42fa7263c 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -71,7 +71,7 @@ else CFLAGS += /MT endif -CC32:= call C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\vcvarsall.bat x86; cl.exe +CC32:= cmd /c C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\vcvarsall.bat x86; cl.exe LINK32 :=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\link.exe LIB32_VC:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC LIB32_SDK:=C:\Program\ Files\ \(x86\)\Windows\ Kits\10\Extension\ SDKs\WindowsMobile\10.0.10240.0\Lib\um\x86 From 1ade0eea97241b1dc67b27eb5cf96db3d837610b Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Mon, 23 Jul 2018 23:40:19 +0300 Subject: [PATCH 140/212] i --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 42fa7263c..468b7541f 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -71,7 +71,7 @@ else CFLAGS += /MT endif -CC32:= cmd /c C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\vcvarsall.bat x86; cl.exe +CC32:= cmd /c "C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\vcvarsall.bat x86"; cl.exe LINK32 :=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\link.exe LIB32_VC:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC LIB32_SDK:=C:\Program\ Files\ \(x86\)\Windows\ Kits\10\Extension\ SDKs\WindowsMobile\10.0.10240.0\Lib\um\x86 From ea41888ff9db07ad5c8561ef88e1998aad9436fa Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Mon, 23 Jul 2018 23:41:55 +0300 Subject: [PATCH 141/212] i --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 468b7541f..d5b4b47db 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -71,7 +71,7 @@ else CFLAGS += /MT endif -CC32:= cmd /c "C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\vcvarsall.bat x86"; cl.exe +CC32:= cmd /c "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat x86"; cl.exe LINK32 :=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\link.exe LIB32_VC:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC LIB32_SDK:=C:\Program\ Files\ \(x86\)\Windows\ Kits\10\Extension\ SDKs\WindowsMobile\10.0.10240.0\Lib\um\x86 From e5579e386e46f332f9c4efd5fc151de5581000ce Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Mon, 23 Jul 2018 23:43:44 +0300 Subject: [PATCH 142/212] i --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index d5b4b47db..5dcddcb19 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -71,7 +71,7 @@ else CFLAGS += /MT endif -CC32:= cmd /c "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat x86"; cl.exe +CC32:= cmd /c "C:\Program\ Files\ (x86)\Microsoft\ Visual\ Studio\ 14.0\VC\vcvarsall.bat x86"; cl.exe LINK32 :=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\link.exe LIB32_VC:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC LIB32_SDK:=C:\Program\ Files\ \(x86\)\Windows\ Kits\10\Extension\ SDKs\WindowsMobile\10.0.10240.0\Lib\um\x86 From a5b7cabe07a9365b04e2b4f6c097439f842baa9c Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Wed, 25 Jul 2018 23:49:05 +0300 Subject: [PATCH 143/212] i --- Makefile.windows.mk | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 5dcddcb19..529e64188 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -41,7 +41,7 @@ ifneq ($(findstring $(MAKECMDGOALS), iis32 iis64 iiszip),) LIB64ENV := $(shell echo "$(LIBPATH)" | findstr amd64) ifeq (,$(LIB64ENV)) -#$(error Missing support for 64 build environment) +$(error Missing support for 64 build environment) endif ifeq (,$(CC32)) @@ -71,12 +71,12 @@ else CFLAGS += /MT endif -CC32:= cmd /c "C:\Program\ Files\ (x86)\Microsoft\ Visual\ Studio\ 14.0\VC\vcvarsall.bat x86"; cl.exe -LINK32 :=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\link.exe -LIB32_VC:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC -LIB32_SDK:=C:\Program\ Files\ \(x86\)\Windows\ Kits\10\Extension\ SDKs\WindowsMobile\10.0.10240.0\Lib\um\x86 -CC=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\x86_amd64\cl.exe -LINK=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\x86_amd64\link.exe +#CC32:= cmd /c "C:\Program\ Files\ (x86)\Microsoft\ Visual\ Studio\ 14.0\VC\vcvarsall.bat x86"; cl.exe +#LINK32 :=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\link.exe +#LIB32_VC:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC +#LIB32_SDK:=C:\Program\ Files\ \(x86\)\Windows\ Kits\10\Extension\ SDKs\WindowsMobile\10.0.10240.0\Lib\um\x86 +#CC=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\x86_amd64\cl.exe +#LINK=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\x86_amd64\link.exe libopenam: $(OUT_OBJS) @$(ECHO) "[*** Creating "$@" shared library ***]" From e96512c01874f014cc538259458936ec6f02bb9a Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Wed, 25 Jul 2018 23:55:34 +0300 Subject: [PATCH 144/212] i --- Makefile.windows.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 529e64188..9d8515362 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -71,6 +71,7 @@ else CFLAGS += /MT endif +CC32:=cmd /c $(CC32) #CC32:= cmd /c "C:\Program\ Files\ (x86)\Microsoft\ Visual\ Studio\ 14.0\VC\vcvarsall.bat x86"; cl.exe #LINK32 :=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\link.exe #LIB32_VC:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC From bde275c53b84bd948ca9d90a34ba2515d13dd357 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Wed, 25 Jul 2018 23:59:16 +0300 Subject: [PATCH 145/212] i --- Makefile.windows.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 9d8515362..8beef1245 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -71,9 +71,8 @@ else CFLAGS += /MT endif -CC32:=cmd /c $(CC32) -#CC32:= cmd /c "C:\Program\ Files\ (x86)\Microsoft\ Visual\ Studio\ 14.0\VC\vcvarsall.bat x86"; cl.exe -#LINK32 :=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\link.exe +CC32:= C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\cl.exe +LINK32:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\link.exe #LIB32_VC:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC #LIB32_SDK:=C:\Program\ Files\ \(x86\)\Windows\ Kits\10\Extension\ SDKs\WindowsMobile\10.0.10240.0\Lib\um\x86 #CC=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\x86_amd64\cl.exe From ca4eb49b48a277cd6de108d4b1d406a4757f3069 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Thu, 26 Jul 2018 00:09:26 +0300 Subject: [PATCH 146/212] i --- Makefile.windows.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 8beef1245..b3ee4db7d 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -73,8 +73,8 @@ endif CC32:= C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\cl.exe LINK32:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\link.exe -#LIB32_VC:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC -#LIB32_SDK:=C:\Program\ Files\ \(x86\)\Windows\ Kits\10\Extension\ SDKs\WindowsMobile\10.0.10240.0\Lib\um\x86 +LIB32_VC:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC +LIB32_SDK:=C:\Program\ Files\ \(x86\)\Windows\ Kits\10\Extension\ SDKs\WindowsMobile\10.0.10240.0\Lib\um\x86 #CC=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\x86_amd64\cl.exe #LINK=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\x86_amd64\link.exe From 7155bfa0df0035ea9f80f2bda59bf440b0074501 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Thu, 26 Jul 2018 00:24:19 +0300 Subject: [PATCH 147/212] i --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index b3ee4db7d..ed1f58a31 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -74,7 +74,7 @@ endif CC32:= C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\cl.exe LINK32:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\link.exe LIB32_VC:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC -LIB32_SDK:=C:\Program\ Files\ \(x86\)\Windows\ Kits\10\Extension\ SDKs\WindowsMobile\10.0.10240.0\Lib\um\x86 +LIB32_SDK:=C:\Program\ Files\ \(x86\)\Windows\ Kits\10\Extension\ SDKs\WindowsMobile\10.0.10240.0\Lib\um #CC=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\x86_amd64\cl.exe #LINK=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\x86_amd64\link.exe From a43eba1aa8d99faf80146e5322edc545f9d3e53a Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Thu, 26 Jul 2018 00:27:03 +0300 Subject: [PATCH 148/212] i --- Makefile.windows.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index ed1f58a31..839cc9ec4 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -73,8 +73,8 @@ endif CC32:= C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\cl.exe LINK32:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\link.exe -LIB32_VC:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC -LIB32_SDK:=C:\Program\ Files\ \(x86\)\Windows\ Kits\10\Extension\ SDKs\WindowsMobile\10.0.10240.0\Lib\um +#LIB32_VC:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC +#LIB32_SDK:=C:\Program\ Files\ \(x86\)\Windows\ Kits\10\Extension\ SDKs\WindowsMobile\10.0.10240.0\Lib\um #CC=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\x86_amd64\cl.exe #LINK=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\x86_amd64\link.exe From 3cf42587680fe94cffdf623e9b54df2eb30b14b2 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 31 Jul 2018 13:50:35 +0300 Subject: [PATCH 149/212] i --- Makefile.windows.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 839cc9ec4..62a16a437 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -73,8 +73,8 @@ endif CC32:= C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\cl.exe LINK32:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\link.exe -#LIB32_VC:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC -#LIB32_SDK:=C:\Program\ Files\ \(x86\)\Windows\ Kits\10\Extension\ SDKs\WindowsMobile\10.0.10240.0\Lib\um +LIB32_VC:=C:\Program Files \(x86\)\Microsoft Visual Studio 14.0\VC +LIB32_SDK:=C:\Program Files \(x86\)\Windows Kits\10\Extension SDKs\WindowsMobile\10.0.10240.0\Lib\um #CC=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\x86_amd64\cl.exe #LINK=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\x86_amd64\link.exe From 8063b1e10d0cf48fe0f324f5d6e2a0bb7d1cd67f Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 31 Jul 2018 14:03:50 +0300 Subject: [PATCH 150/212] i --- Makefile.windows.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 62a16a437..ed1f58a31 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -73,8 +73,8 @@ endif CC32:= C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\cl.exe LINK32:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\link.exe -LIB32_VC:=C:\Program Files \(x86\)\Microsoft Visual Studio 14.0\VC -LIB32_SDK:=C:\Program Files \(x86\)\Windows Kits\10\Extension SDKs\WindowsMobile\10.0.10240.0\Lib\um +LIB32_VC:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC +LIB32_SDK:=C:\Program\ Files\ \(x86\)\Windows\ Kits\10\Extension\ SDKs\WindowsMobile\10.0.10240.0\Lib\um #CC=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\x86_amd64\cl.exe #LINK=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\x86_amd64\link.exe From adfef2bc946a007b842d095229fa503eb55e44bd Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 31 Jul 2018 14:24:51 +0300 Subject: [PATCH 151/212] i --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index ed1f58a31..22e460540 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -126,7 +126,7 @@ iis32: $(OUT_OBJS) $(IIS_OUT_OBJS) $(SED) -e "s$(SUB)_FILE_NAME_$(SUB)mod_iis_openam_32.dll$(SUB)g" \ -e "s$(SUB)_FILE_TYPE_$(SUB)VFT_DLL$(SUB)g" source/version.rc.template >> $(OBJDIR)/version.rc $(RC) /l 0x0409 /nologo /fo $(OBJDIR)$(PS)version.res $(OBJDIR)$(PS)version.rc - $(LINK32) $(SHARED) /LIBPATH:\"$(LIB32_SDK)\x86\" /LIBPATH:\"$(LIB32_VC)\LIB\" $(LDFLAGS) $(OUT_OBJS) $(IIS_OUT_OBJS) $(OBJDIR)/version.res /OUT:build/mod_iis_openam_32.dll /PDB:build/mod_iis_openam_32.pdb $(LIBS) /EXPORT:RegisterModule oleaut32.lib + $(LINK32) $(SHARED) /LIBPATH:\"$(LIB32_SDK)\x86" /LIBPATH:\"$(LIB32_VC)\lib" $(LDFLAGS) $(OUT_OBJS) $(IIS_OUT_OBJS) $(OBJDIR)/version.res /OUT:build/mod_iis_openam_32.dll /PDB:build/mod_iis_openam_32.pdb $(LIBS) /EXPORT:RegisterModule oleaut32.lib $(CP) $(OBJDIR)$(PS)mod_iis_openam_32.dll $(OBJDIR)$(PS)dist $(CP) $(OBJDIR)$(PS)mod_iis_openam_32.pdb $(OBJDIR)$(PS)dist From a3dacfe3973f7b50a6aff695862646a021fe0c80 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 31 Jul 2018 14:28:09 +0300 Subject: [PATCH 152/212] i --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 22e460540..30d034aec 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -126,7 +126,7 @@ iis32: $(OUT_OBJS) $(IIS_OUT_OBJS) $(SED) -e "s$(SUB)_FILE_NAME_$(SUB)mod_iis_openam_32.dll$(SUB)g" \ -e "s$(SUB)_FILE_TYPE_$(SUB)VFT_DLL$(SUB)g" source/version.rc.template >> $(OBJDIR)/version.rc $(RC) /l 0x0409 /nologo /fo $(OBJDIR)$(PS)version.res $(OBJDIR)$(PS)version.rc - $(LINK32) $(SHARED) /LIBPATH:\"$(LIB32_SDK)\x86" /LIBPATH:\"$(LIB32_VC)\lib" $(LDFLAGS) $(OUT_OBJS) $(IIS_OUT_OBJS) $(OBJDIR)/version.res /OUT:build/mod_iis_openam_32.dll /PDB:build/mod_iis_openam_32.pdb $(LIBS) /EXPORT:RegisterModule oleaut32.lib + $(LINK32) $(SHARED) /LIBPATH:\"$(LIB32_SDK)\x86\" /LIBPATH:\"$(LIB32_VC)\lib\" $(LDFLAGS) $(OUT_OBJS) $(IIS_OUT_OBJS) $(OBJDIR)/version.res /OUT:build/mod_iis_openam_32.dll /PDB:build/mod_iis_openam_32.pdb $(LIBS) /EXPORT:RegisterModule oleaut32.lib $(CP) $(OBJDIR)$(PS)mod_iis_openam_32.dll $(OBJDIR)$(PS)dist $(CP) $(OBJDIR)$(PS)mod_iis_openam_32.pdb $(OBJDIR)$(PS)dist From 71ed0514e607325164ccf9b16dd9601d9575e7d4 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 31 Jul 2018 14:37:03 +0300 Subject: [PATCH 153/212] i --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 30d034aec..eb8176a6e 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -126,7 +126,7 @@ iis32: $(OUT_OBJS) $(IIS_OUT_OBJS) $(SED) -e "s$(SUB)_FILE_NAME_$(SUB)mod_iis_openam_32.dll$(SUB)g" \ -e "s$(SUB)_FILE_TYPE_$(SUB)VFT_DLL$(SUB)g" source/version.rc.template >> $(OBJDIR)/version.rc $(RC) /l 0x0409 /nologo /fo $(OBJDIR)$(PS)version.res $(OBJDIR)$(PS)version.rc - $(LINK32) $(SHARED) /LIBPATH:\"$(LIB32_SDK)\x86\" /LIBPATH:\"$(LIB32_VC)\lib\" $(LDFLAGS) $(OUT_OBJS) $(IIS_OUT_OBJS) $(OBJDIR)/version.res /OUT:build/mod_iis_openam_32.dll /PDB:build/mod_iis_openam_32.pdb $(LIBS) /EXPORT:RegisterModule oleaut32.lib + $(LINK32) /VERBOSE $(SHARED) /LIBPATH:$(LIB32_SDK)\x86 /LIBPATH:$(LIB32_VC)\lib $(LDFLAGS) $(OUT_OBJS) $(IIS_OUT_OBJS) $(OBJDIR)/version.res /OUT:build/mod_iis_openam_32.dll /PDB:build/mod_iis_openam_32.pdb $(LIBS) /EXPORT:RegisterModule oleaut32.lib $(CP) $(OBJDIR)$(PS)mod_iis_openam_32.dll $(OBJDIR)$(PS)dist $(CP) $(OBJDIR)$(PS)mod_iis_openam_32.pdb $(OBJDIR)$(PS)dist From 602d5c83b170a59a9c56b3a8c35ffc2bc6067f2a Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 31 Jul 2018 17:02:15 +0300 Subject: [PATCH 154/212] i --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index eb8176a6e..de5dc3d99 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -126,7 +126,7 @@ iis32: $(OUT_OBJS) $(IIS_OUT_OBJS) $(SED) -e "s$(SUB)_FILE_NAME_$(SUB)mod_iis_openam_32.dll$(SUB)g" \ -e "s$(SUB)_FILE_TYPE_$(SUB)VFT_DLL$(SUB)g" source/version.rc.template >> $(OBJDIR)/version.rc $(RC) /l 0x0409 /nologo /fo $(OBJDIR)$(PS)version.res $(OBJDIR)$(PS)version.rc - $(LINK32) /VERBOSE $(SHARED) /LIBPATH:$(LIB32_SDK)\x86 /LIBPATH:$(LIB32_VC)\lib $(LDFLAGS) $(OUT_OBJS) $(IIS_OUT_OBJS) $(OBJDIR)/version.res /OUT:build/mod_iis_openam_32.dll /PDB:build/mod_iis_openam_32.pdb $(LIBS) /EXPORT:RegisterModule oleaut32.lib + LIB="";LIBPATH="";$(LINK32) /VERBOSE $(SHARED) /LIBPATH:$(LIB32_SDK)\x86 /LIBPATH:$(LIB32_VC)\lib $(LDFLAGS) $(OUT_OBJS) $(IIS_OUT_OBJS) $(OBJDIR)/version.res /OUT:build/mod_iis_openam_32.dll /PDB:build/mod_iis_openam_32.pdb $(LIBS) /EXPORT:RegisterModule oleaut32.lib $(CP) $(OBJDIR)$(PS)mod_iis_openam_32.dll $(OBJDIR)$(PS)dist $(CP) $(OBJDIR)$(PS)mod_iis_openam_32.pdb $(OBJDIR)$(PS)dist From 1f7a6e7cb4fd539e8860bf523267054b145ffc0b Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 31 Jul 2018 17:57:10 +0300 Subject: [PATCH 155/212] i --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index de5dc3d99..ab40d93c6 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -72,7 +72,7 @@ else endif CC32:= C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\cl.exe -LINK32:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\link.exe +LINK32:=C:\\Program\ Files\ \(x86\)\\Microsoft\ Visual\ Studio\ 14.0\\VC\\bin\\link.exe LIB32_VC:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC LIB32_SDK:=C:\Program\ Files\ \(x86\)\Windows\ Kits\10\Extension\ SDKs\WindowsMobile\10.0.10240.0\Lib\um #CC=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\x86_amd64\cl.exe From 93f5bf56b397e8727e4960eaf14a3d58d80fdd00 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 31 Jul 2018 18:10:59 +0300 Subject: [PATCH 156/212] i --- Makefile.windows.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index ab40d93c6..c12a2b4c0 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -72,9 +72,10 @@ else endif CC32:= C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\cl.exe -LINK32:=C:\\Program\ Files\ \(x86\)\\Microsoft\ Visual\ Studio\ 14.0\\VC\\bin\\link.exe +LINK32:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\link.exe LIB32_VC:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC LIB32_SDK:=C:\Program\ Files\ \(x86\)\Windows\ Kits\10\Extension\ SDKs\WindowsMobile\10.0.10240.0\Lib\um +LIB32_UCRT=C:\Program\ Files\ \(x86\)\Windows\ Kits\10\lib\10.0.10240.0\ucrt #CC=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\x86_amd64\cl.exe #LINK=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\x86_amd64\link.exe @@ -126,7 +127,7 @@ iis32: $(OUT_OBJS) $(IIS_OUT_OBJS) $(SED) -e "s$(SUB)_FILE_NAME_$(SUB)mod_iis_openam_32.dll$(SUB)g" \ -e "s$(SUB)_FILE_TYPE_$(SUB)VFT_DLL$(SUB)g" source/version.rc.template >> $(OBJDIR)/version.rc $(RC) /l 0x0409 /nologo /fo $(OBJDIR)$(PS)version.res $(OBJDIR)$(PS)version.rc - LIB="";LIBPATH="";$(LINK32) /VERBOSE $(SHARED) /LIBPATH:$(LIB32_SDK)\x86 /LIBPATH:$(LIB32_VC)\lib $(LDFLAGS) $(OUT_OBJS) $(IIS_OUT_OBJS) $(OBJDIR)/version.res /OUT:build/mod_iis_openam_32.dll /PDB:build/mod_iis_openam_32.pdb $(LIBS) /EXPORT:RegisterModule oleaut32.lib + $(LINK32) /VERBOSE $(SHARED) /LIBPATH:$(LIB32_SDK)\x86 /LIBPATH:$(LIB32_VC)\lib /LIBPATH:$(LIB32_UCRT)\x86 $(LDFLAGS) $(OUT_OBJS) $(IIS_OUT_OBJS) $(OBJDIR)/version.res /OUT:build/mod_iis_openam_32.dll /PDB:build/mod_iis_openam_32.pdb $(LIBS) /EXPORT:RegisterModule oleaut32.lib $(CP) $(OBJDIR)$(PS)mod_iis_openam_32.dll $(OBJDIR)$(PS)dist $(CP) $(OBJDIR)$(PS)mod_iis_openam_32.pdb $(OBJDIR)$(PS)dist From 3953d1f6b806fd4251713404478a6a02f977f87d Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 31 Jul 2018 18:29:22 +0300 Subject: [PATCH 157/212] i --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index c12a2b4c0..c8b13f805 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -74,7 +74,7 @@ endif CC32:= C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\cl.exe LINK32:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\link.exe LIB32_VC:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC -LIB32_SDK:=C:\Program\ Files\ \(x86\)\Windows\ Kits\10\Extension\ SDKs\WindowsMobile\10.0.10240.0\Lib\um +LIB32_SDK:=C:\Program\ Files\ \(x86\)\Windows\ Kits\10\Lib\10.0.10240.0\um LIB32_UCRT=C:\Program\ Files\ \(x86\)\Windows\ Kits\10\lib\10.0.10240.0\ucrt #CC=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\x86_amd64\cl.exe #LINK=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\x86_amd64\link.exe From 31098b14890815ac722edf9aa55e2027cde3d13e Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 31 Jul 2018 18:34:25 +0300 Subject: [PATCH 158/212] i --- Makefile.windows.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index c8b13f805..7b79b8915 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -74,8 +74,8 @@ endif CC32:= C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\cl.exe LINK32:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\link.exe LIB32_VC:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC -LIB32_SDK:=C:\Program\ Files\ \(x86\)\Windows\ Kits\10\Lib\10.0.10240.0\um -LIB32_UCRT=C:\Program\ Files\ \(x86\)\Windows\ Kits\10\lib\10.0.10240.0\ucrt +LIB32_SDK:=C:\Program\ Files\ \(x86\)\Windows\ Kits\10\Lib\10.0.14393.0\um +#LIB32_UCRT=C:\Program\ Files\ \(x86\)\Windows\ Kits\10\lib\10.0.10240.0\ucrt #CC=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\x86_amd64\cl.exe #LINK=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\x86_amd64\link.exe @@ -127,7 +127,7 @@ iis32: $(OUT_OBJS) $(IIS_OUT_OBJS) $(SED) -e "s$(SUB)_FILE_NAME_$(SUB)mod_iis_openam_32.dll$(SUB)g" \ -e "s$(SUB)_FILE_TYPE_$(SUB)VFT_DLL$(SUB)g" source/version.rc.template >> $(OBJDIR)/version.rc $(RC) /l 0x0409 /nologo /fo $(OBJDIR)$(PS)version.res $(OBJDIR)$(PS)version.rc - $(LINK32) /VERBOSE $(SHARED) /LIBPATH:$(LIB32_SDK)\x86 /LIBPATH:$(LIB32_VC)\lib /LIBPATH:$(LIB32_UCRT)\x86 $(LDFLAGS) $(OUT_OBJS) $(IIS_OUT_OBJS) $(OBJDIR)/version.res /OUT:build/mod_iis_openam_32.dll /PDB:build/mod_iis_openam_32.pdb $(LIBS) /EXPORT:RegisterModule oleaut32.lib + $(LINK32) $(SHARED) /LIBPATH:$(LIB32_SDK)\x86 /LIBPATH:$(LIB32_VC)\lib $(LDFLAGS) $(OUT_OBJS) $(IIS_OUT_OBJS) $(OBJDIR)/version.res /OUT:build/mod_iis_openam_32.dll /PDB:build/mod_iis_openam_32.pdb $(LIBS) /EXPORT:RegisterModule oleaut32.lib $(CP) $(OBJDIR)$(PS)mod_iis_openam_32.dll $(OBJDIR)$(PS)dist $(CP) $(OBJDIR)$(PS)mod_iis_openam_32.pdb $(OBJDIR)$(PS)dist @@ -175,7 +175,7 @@ agentadmin_iis: $(OUT_OBJS) $(ADMIN_OUT_OBJS) -e "s$(SUB)DESCRIPTION$(SUB)\"OpenAM Web Agent Administration Utility\"$(SUB)g" \ -e "s$(SUB)_FILE_TYPE_$(SUB)VFT_APP$(SUB)g" < source$(PS)version.rc.template > $(OBJDIR)$(PS)version.rc $(RC) /l 0x0409 /nologo /fo $(OBJDIR)$(PS)version.res $(OBJDIR)$(PS)version.rc - ${LINK32} /LIBPATH:\"$(LIB32_SDK)\x86\" /LIBPATH:\"$(LIB32_VC)\LIB\" $(LDFLAGS) $(OUT_OBJS) $(ADMIN_OUT_OBJS) $(OBJDIR)\version.res /OUT:build\agentadmin.exe /PDB:build\agentadmin.pdb $(LIBS) ole32.lib oleaut32.lib ahadmin.lib + ${LINK32} /LIBPATH:$(LIB32_SDK)\x86 /LIBPATH:$(LIB32_VC)\LIB $(LDFLAGS) $(OUT_OBJS) $(ADMIN_OUT_OBJS) $(OBJDIR)\version.res /OUT:build\agentadmin.exe /PDB:build\agentadmin.pdb $(LIBS) ole32.lib oleaut32.lib ahadmin.lib $(CP) $(OBJDIR)$(PS)agentadmin.pdb $(OBJDIR)$(PS)dist $(CP) $(OBJDIR)$(PS)agentadmin.exe $(OBJDIR)$(PS)dist From 2bad5e49823571211c4e10ccacc74815dd30db15 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 31 Jul 2018 18:41:27 +0300 Subject: [PATCH 159/212] i --- Makefile.windows.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 7b79b8915..55e65c4b2 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -75,7 +75,7 @@ CC32:= C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\cl.exe LINK32:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\link.exe LIB32_VC:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC LIB32_SDK:=C:\Program\ Files\ \(x86\)\Windows\ Kits\10\Lib\10.0.14393.0\um -#LIB32_UCRT=C:\Program\ Files\ \(x86\)\Windows\ Kits\10\lib\10.0.10240.0\ucrt +LIB32_UCRT=C:\Program\ Files\ \(x86\)\Windows\ Kits\10\lib\10.0.14393.0\ucrt #CC=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\x86_amd64\cl.exe #LINK=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\x86_amd64\link.exe @@ -127,7 +127,7 @@ iis32: $(OUT_OBJS) $(IIS_OUT_OBJS) $(SED) -e "s$(SUB)_FILE_NAME_$(SUB)mod_iis_openam_32.dll$(SUB)g" \ -e "s$(SUB)_FILE_TYPE_$(SUB)VFT_DLL$(SUB)g" source/version.rc.template >> $(OBJDIR)/version.rc $(RC) /l 0x0409 /nologo /fo $(OBJDIR)$(PS)version.res $(OBJDIR)$(PS)version.rc - $(LINK32) $(SHARED) /LIBPATH:$(LIB32_SDK)\x86 /LIBPATH:$(LIB32_VC)\lib $(LDFLAGS) $(OUT_OBJS) $(IIS_OUT_OBJS) $(OBJDIR)/version.res /OUT:build/mod_iis_openam_32.dll /PDB:build/mod_iis_openam_32.pdb $(LIBS) /EXPORT:RegisterModule oleaut32.lib + $(LINK32) $(SHARED) /LIBPATH:$(LIB32_SDK)\x86 /LIBPATH:$(LIB32_UCRT)\x86 /LIBPATH:$(LIB32_VC)\lib $(LDFLAGS) $(OUT_OBJS) $(IIS_OUT_OBJS) $(OBJDIR)/version.res /OUT:build/mod_iis_openam_32.dll /PDB:build/mod_iis_openam_32.pdb $(LIBS) /EXPORT:RegisterModule oleaut32.lib $(CP) $(OBJDIR)$(PS)mod_iis_openam_32.dll $(OBJDIR)$(PS)dist $(CP) $(OBJDIR)$(PS)mod_iis_openam_32.pdb $(OBJDIR)$(PS)dist @@ -175,7 +175,7 @@ agentadmin_iis: $(OUT_OBJS) $(ADMIN_OUT_OBJS) -e "s$(SUB)DESCRIPTION$(SUB)\"OpenAM Web Agent Administration Utility\"$(SUB)g" \ -e "s$(SUB)_FILE_TYPE_$(SUB)VFT_APP$(SUB)g" < source$(PS)version.rc.template > $(OBJDIR)$(PS)version.rc $(RC) /l 0x0409 /nologo /fo $(OBJDIR)$(PS)version.res $(OBJDIR)$(PS)version.rc - ${LINK32} /LIBPATH:$(LIB32_SDK)\x86 /LIBPATH:$(LIB32_VC)\LIB $(LDFLAGS) $(OUT_OBJS) $(ADMIN_OUT_OBJS) $(OBJDIR)\version.res /OUT:build\agentadmin.exe /PDB:build\agentadmin.pdb $(LIBS) ole32.lib oleaut32.lib ahadmin.lib + ${LINK32} /LIBPATH:$(LIB32_SDK)\x86 /LIBPATH:$(LIB32_UCRT)\x86 /LIBPATH:$(LIB32_VC)\LIB $(LDFLAGS) $(OUT_OBJS) $(ADMIN_OUT_OBJS) $(OBJDIR)\version.res /OUT:build\agentadmin.exe /PDB:build\agentadmin.pdb $(LIBS) ole32.lib oleaut32.lib ahadmin.lib $(CP) $(OBJDIR)$(PS)agentadmin.pdb $(OBJDIR)$(PS)dist $(CP) $(OBJDIR)$(PS)agentadmin.exe $(OBJDIR)$(PS)dist From 0d2f6cb7adb8299dea45a268d329d67a518d6b1c Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 31 Jul 2018 19:05:41 +0300 Subject: [PATCH 160/212] i --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 18de55698..bd483309e 100644 --- a/Makefile +++ b/Makefile @@ -37,7 +37,7 @@ ifneq ("$(PROGRAMFILES)$(ProgramFiles)","") RMDIR := cmd /c rmdir /S /Q SED := sed ECHO := echo - MKDIR := cmd /c mkdir + MKDIR := mkdir -p CP := cp -r CD := cd CAT :=cat From 440730140ae70c80b4e2eb65d1efdc9f9175bd4c Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 31 Jul 2018 19:12:29 +0300 Subject: [PATCH 161/212] i --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index bd483309e..eca722445 100644 --- a/Makefile +++ b/Makefile @@ -38,7 +38,7 @@ ifneq ("$(PROGRAMFILES)$(ProgramFiles)","") SED := sed ECHO := echo MKDIR := mkdir -p - CP := cp -r + CP := cmd /c copy /Y CD := cd CAT :=cat EXEC := From fe41a158f164e86a583d84cb96d8920890e8bcb3 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 31 Jul 2018 19:18:58 +0300 Subject: [PATCH 162/212] i:x --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index eca722445..ff2ed68e9 100644 --- a/Makefile +++ b/Makefile @@ -323,7 +323,7 @@ iiszip: clean build version iis -$(CP) $(OBJDIR)$(PS)dist$(PS)mod_iis_openam* $(OBJDIR)$(PS)web_agents$(PS)iis_agent$(PS)lib$(PS) -$(CP) config$(PS)* $(OBJDIR)$(PS)web_agents$(PS)iis_agent$(PS)config$(PS) -$(CP) legal$(PS)* $(OBJDIR)$(PS)web_agents$(PS)iis_agent$(PS)legal$(PS) - $(CD) $(OBJDIR) && $(EXEC)agentadmin --a IIS_$(OS_ARCH)_$(VERSION).zip web_agents + $(CD) $(OBJDIR) && $(EXEC)agentadmin.exe --a IIS_$(OS_ARCH)_$(VERSION).zip web_agents varnishzip: CFLAGS += $(COMPILEFLAG)DSERVER_VERSION='"4.1.x"' varnishzip: CONTAINER = $(strip Varnish 4.1.x $(OS_ARCH)$(OS_ARCH_EXT) $(subst _,,$(OS_BITS))) From 52905c517351b043a621d7f60e3a491b9d29d7e5 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 31 Jul 2018 19:23:57 +0300 Subject: [PATCH 163/212] i --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ff2ed68e9..0852ad3e1 100644 --- a/Makefile +++ b/Makefile @@ -323,7 +323,7 @@ iiszip: clean build version iis -$(CP) $(OBJDIR)$(PS)dist$(PS)mod_iis_openam* $(OBJDIR)$(PS)web_agents$(PS)iis_agent$(PS)lib$(PS) -$(CP) config$(PS)* $(OBJDIR)$(PS)web_agents$(PS)iis_agent$(PS)config$(PS) -$(CP) legal$(PS)* $(OBJDIR)$(PS)web_agents$(PS)iis_agent$(PS)legal$(PS) - $(CD) $(OBJDIR) && $(EXEC)agentadmin.exe --a IIS_$(OS_ARCH)_$(VERSION).zip web_agents + $(CD) $(OBJDIR) && $(OBJDIR)$(PS)agentadmin.exe --a IIS_$(OS_ARCH)_$(VERSION).zip web_agents varnishzip: CFLAGS += $(COMPILEFLAG)DSERVER_VERSION='"4.1.x"' varnishzip: CONTAINER = $(strip Varnish 4.1.x $(OS_ARCH)$(OS_ARCH_EXT) $(subst _,,$(OS_BITS))) From f99e5af5ecf0d3cba19d961935682a1159f7372b Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 31 Jul 2018 19:31:55 +0300 Subject: [PATCH 164/212] i --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 0852ad3e1..cc610815b 100644 --- a/Makefile +++ b/Makefile @@ -41,7 +41,7 @@ ifneq ("$(PROGRAMFILES)$(ProgramFiles)","") CP := cmd /c copy /Y CD := cd CAT :=cat - EXEC := + EXEC :=./ REVISION := Revision: $(shell git rev-parse --short HEAD) BUILD_MACHINE := $(shell hostname) IDENT_DATE := $(shell powershell get-date -format "{dd.MM.yyyy}") @@ -323,7 +323,7 @@ iiszip: clean build version iis -$(CP) $(OBJDIR)$(PS)dist$(PS)mod_iis_openam* $(OBJDIR)$(PS)web_agents$(PS)iis_agent$(PS)lib$(PS) -$(CP) config$(PS)* $(OBJDIR)$(PS)web_agents$(PS)iis_agent$(PS)config$(PS) -$(CP) legal$(PS)* $(OBJDIR)$(PS)web_agents$(PS)iis_agent$(PS)legal$(PS) - $(CD) $(OBJDIR) && $(OBJDIR)$(PS)agentadmin.exe --a IIS_$(OS_ARCH)_$(VERSION).zip web_agents + $(CD) $(OBJDIR) && $(EXEC)agentadmin.exe --a IIS_$(OS_ARCH)_$(VERSION).zip web_agents varnishzip: CFLAGS += $(COMPILEFLAG)DSERVER_VERSION='"4.1.x"' varnishzip: CONTAINER = $(strip Varnish 4.1.x $(OS_ARCH)$(OS_ARCH_EXT) $(subst _,,$(OS_BITS))) From 10101cbd5e18de8a5d294bb04b0d8cc3a559f25a Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 31 Jul 2018 19:36:41 +0300 Subject: [PATCH 165/212] i --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index cc610815b..fcee7154f 100644 --- a/Makefile +++ b/Makefile @@ -41,7 +41,7 @@ ifneq ("$(PROGRAMFILES)$(ProgramFiles)","") CP := cmd /c copy /Y CD := cd CAT :=cat - EXEC :=./ + EXEC :=./ REVISION := Revision: $(shell git rev-parse --short HEAD) BUILD_MACHINE := $(shell hostname) IDENT_DATE := $(shell powershell get-date -format "{dd.MM.yyyy}") From 74fe4fdd4803fd6a2e8bee005a6f01e5baae9f68 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 31 Jul 2018 20:28:01 +0300 Subject: [PATCH 166/212] curl --- Makefile | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index fcee7154f..fe826a43e 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ # 64=1 builds 64bit binary # DEBUG=1 builds debug binary version -HTTPD24_VERSION=2.4.33 +HTTPD24_VERSION=2.4.34 HTTPD22_VERSION=2.2.34 APR_VERSION=1.6.3 APR_UTIL_VERSION=1.6.1 @@ -52,7 +52,7 @@ ifneq ("$(PROGRAMFILES)$(ProgramFiles)","") OBJ=obj UTAR=7z x UBZIP=7z x - WGET=powershell /c Invoke-WebRequest + CURL=curl else OS_ARCH := $(shell uname -s) OS_MARCH := $(shell uname -m) @@ -74,7 +74,7 @@ else OBJ=o UTAR=tar xf UBZIP=bunzip2 - WGET=wget + CURL=curl CAT=cat endif @@ -218,12 +218,12 @@ test_includes: $(SED) -ie "s$(SUB)\"$(SUB) $(SUB)g" $(OBJDIR)$(PS)tests$(PS)tests.h apr: - -$(WGET) http://mirrors.ukfast.co.uk/sites/ftp.apache.org/apr/apr-${APR_VERSION}.tar.bz2 + -$(CURL) http://mirrors.ukfast.co.uk/sites/ftp.apache.org/apr/apr-${APR_VERSION}.tar.bz2 --O apr-${APR_VERSION}.tar.bz2 -$(UBZIP) apr-${APR_VERSION}.tar.bz2; $(UTAR) apr-${APR_VERSION}.tar - -$(WGET) http://mirrors.ukfast.co.uk/sites/ftp.apache.org/apr/apr-util-${APR_UTIL_VERSION}.tar.bz2 + -$(CURL) http://mirrors.ukfast.co.uk/sites/ftp.apache.org/apr/apr-util-${APR_UTIL_VERSION}.tar.bz2 --O apr-util-${APR_UTIL_VERSION}.tar.bz2 -$(UBZIP) apr-util-${APR_UTIL_VERSION}.tar.bz2; $(UTAR) apr-util-${APR_UTIL_VERSION}.tar apache-src: apr - -$(WGET) http://mirrors.ukfast.co.uk/sites/ftp.apache.org/httpd/httpd-${HTTPD24_VERSION}.tar.bz2 + -$(CURL) http://mirrors.ukfast.co.uk/sites/ftp.apache.org/httpd/httpd-${HTTPD24_VERSION}.tar.bz2 --O httpd-${HTTPD24_VERSION}.tar.bz2 -$(UBZIP) httpd-${HTTPD24_VERSION}.tar.bz2; $(UTAR) httpd-${HTTPD24_VERSION}.tar -$(MKDIR) extlib/$(OS_ARCH)_$(OS_MARCH) -$(CP) httpd-${HTTPD24_VERSION} extlib/$(OS_ARCH)_$(OS_MARCH)/apache24 @@ -232,7 +232,7 @@ apache-src: apr -$(RMALL) httpd-* apr-* -$(CD) extlib/$(OS_ARCH)_$(OS_MARCH)/apache24; ./configure --with-included-apr apache22-src: apr - -$(WGET) https://archive.apache.org/dist/httpd/httpd-${HTTPD22_VERSION}.tar.bz2 + -$(CURL) https://archive.apache.org/dist/httpd/httpd-${HTTPD22_VERSION}.tar.bz2 --O httpd-${HTTPD22_VERSION}.tar.bz2 -$(UBZIP) httpd-${HTTPD22_VERSION}.tar.bz2; $(UTAR) httpd-${HTTPD22_VERSION}.tar -$(MKDIR) extlib/$(OS_ARCH)_$(OS_MARCH) -$(CP) httpd-${HTTPD22_VERSION} extlib/$(OS_ARCH)_$(OS_MARCH)/apache22 @@ -324,6 +324,7 @@ iiszip: clean build version iis -$(CP) config$(PS)* $(OBJDIR)$(PS)web_agents$(PS)iis_agent$(PS)config$(PS) -$(CP) legal$(PS)* $(OBJDIR)$(PS)web_agents$(PS)iis_agent$(PS)legal$(PS) $(CD) $(OBJDIR) && $(EXEC)agentadmin.exe --a IIS_$(OS_ARCH)_$(VERSION).zip web_agents + mv $(OBJDIR)/*.zip ./ varnishzip: CFLAGS += $(COMPILEFLAG)DSERVER_VERSION='"4.1.x"' varnishzip: CONTAINER = $(strip Varnish 4.1.x $(OS_ARCH)$(OS_ARCH_EXT) $(subst _,,$(OS_BITS))) From 8556e48f3123df45f6f62527779b031960d8d41c Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 31 Jul 2018 20:34:48 +0300 Subject: [PATCH 167/212] i --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index fe826a43e..20b157fce 100644 --- a/Makefile +++ b/Makefile @@ -218,12 +218,12 @@ test_includes: $(SED) -ie "s$(SUB)\"$(SUB) $(SUB)g" $(OBJDIR)$(PS)tests$(PS)tests.h apr: - -$(CURL) http://mirrors.ukfast.co.uk/sites/ftp.apache.org/apr/apr-${APR_VERSION}.tar.bz2 --O apr-${APR_VERSION}.tar.bz2 + -$(CURL) -O http://mirrors.ukfast.co.uk/sites/ftp.apache.org/apr/apr-${APR_VERSION}.tar.bz2 -$(UBZIP) apr-${APR_VERSION}.tar.bz2; $(UTAR) apr-${APR_VERSION}.tar - -$(CURL) http://mirrors.ukfast.co.uk/sites/ftp.apache.org/apr/apr-util-${APR_UTIL_VERSION}.tar.bz2 --O apr-util-${APR_UTIL_VERSION}.tar.bz2 + -$(CURL) -O http://mirrors.ukfast.co.uk/sites/ftp.apache.org/apr/apr-util-${APR_UTIL_VERSION}.tar.bz2 -$(UBZIP) apr-util-${APR_UTIL_VERSION}.tar.bz2; $(UTAR) apr-util-${APR_UTIL_VERSION}.tar apache-src: apr - -$(CURL) http://mirrors.ukfast.co.uk/sites/ftp.apache.org/httpd/httpd-${HTTPD24_VERSION}.tar.bz2 --O httpd-${HTTPD24_VERSION}.tar.bz2 + -$(CURL) -O http://mirrors.ukfast.co.uk/sites/ftp.apache.org/httpd/httpd-${HTTPD24_VERSION}.tar.bz2 -$(UBZIP) httpd-${HTTPD24_VERSION}.tar.bz2; $(UTAR) httpd-${HTTPD24_VERSION}.tar -$(MKDIR) extlib/$(OS_ARCH)_$(OS_MARCH) -$(CP) httpd-${HTTPD24_VERSION} extlib/$(OS_ARCH)_$(OS_MARCH)/apache24 @@ -232,7 +232,7 @@ apache-src: apr -$(RMALL) httpd-* apr-* -$(CD) extlib/$(OS_ARCH)_$(OS_MARCH)/apache24; ./configure --with-included-apr apache22-src: apr - -$(CURL) https://archive.apache.org/dist/httpd/httpd-${HTTPD22_VERSION}.tar.bz2 --O httpd-${HTTPD22_VERSION}.tar.bz2 + -$(CURL) -O https://archive.apache.org/dist/httpd/httpd-${HTTPD22_VERSION}.tar.bz2 -$(UBZIP) httpd-${HTTPD22_VERSION}.tar.bz2; $(UTAR) httpd-${HTTPD22_VERSION}.tar -$(MKDIR) extlib/$(OS_ARCH)_$(OS_MARCH) -$(CP) httpd-${HTTPD22_VERSION} extlib/$(OS_ARCH)_$(OS_MARCH)/apache22 From 279aca8bcf20e2c5bdebc626333fb3c96f374cc2 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 31 Jul 2018 20:43:27 +0300 Subject: [PATCH 168/212] i --- Makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 20b157fce..5733d2ec0 100644 --- a/Makefile +++ b/Makefile @@ -226,20 +226,20 @@ apache-src: apr -$(CURL) -O http://mirrors.ukfast.co.uk/sites/ftp.apache.org/httpd/httpd-${HTTPD24_VERSION}.tar.bz2 -$(UBZIP) httpd-${HTTPD24_VERSION}.tar.bz2; $(UTAR) httpd-${HTTPD24_VERSION}.tar -$(MKDIR) extlib/$(OS_ARCH)_$(OS_MARCH) - -$(CP) httpd-${HTTPD24_VERSION} extlib/$(OS_ARCH)_$(OS_MARCH)/apache24 - -$(CP) apr-${APR_VERSION} extlib/$(OS_ARCH)_$(OS_MARCH)/apache24/srclib/apr - -$(CP) apr-util-${APR_UTIL_VERSION} extlib/$(OS_ARCH)_$(OS_MARCH)/apache24/srclib/apr-util + -$(CP) httpd-${HTTPD24_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24 + -$(CP) apr-${APR_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24$(PS)srclib$(PS)apr + -$(CP) apr-util-${APR_UTIL_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24$(PS)srclib$(PS)apr-util -$(RMALL) httpd-* apr-* - -$(CD) extlib/$(OS_ARCH)_$(OS_MARCH)/apache24; ./configure --with-included-apr + -$(CD) extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24; ./configure --with-included-apr apache22-src: apr -$(CURL) -O https://archive.apache.org/dist/httpd/httpd-${HTTPD22_VERSION}.tar.bz2 -$(UBZIP) httpd-${HTTPD22_VERSION}.tar.bz2; $(UTAR) httpd-${HTTPD22_VERSION}.tar -$(MKDIR) extlib/$(OS_ARCH)_$(OS_MARCH) - -$(CP) httpd-${HTTPD22_VERSION} extlib/$(OS_ARCH)_$(OS_MARCH)/apache22 - -$(CP) apr-${APR_VERSION} extlib/$(OS_ARCH)_$(OS_MARCH)/apache22/srclib/apr - -$(CP) apr-util-${APR_UTIL_VERSION} extlib/$(OS_ARCH)_$(OS_MARCH)/apache22/srclib/apr-util + -$(CP) httpd-${HTTPD22_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache22 + -$(CP) apr-${APR_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache22$(PS)srclib$(PS)apr + -$(CP) apr-util-${APR_UTIL_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache22$(PS)srclib$(PS)apr-util -$(RMALL) httpd-* apr-* - -$(CD) extlib/$(OS_ARCH)_$(OS_MARCH)/apache22; ./configure --with-included-apr + -$(CD) extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache22; ./configure --with-included-apr apachezip: CFLAGS += $(COMPILEFLAG)DSERVER_VERSION='"2.4.x"' apachezip: CONTAINER = $(strip Apache 2.4 $(OS_ARCH)$(OS_ARCH_EXT) $(subst _,,$(OS_BITS))) apachezip: clean build version apache-src apache agentadmin From c6d2eeac2fefe3400b541a3039ab761a288eb741 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Wed, 1 Aug 2018 09:18:29 +0300 Subject: [PATCH 169/212] i --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5733d2ec0..3d3bcc7e3 100644 --- a/Makefile +++ b/Makefile @@ -38,7 +38,7 @@ ifneq ("$(PROGRAMFILES)$(ProgramFiles)","") SED := sed ECHO := echo MKDIR := mkdir -p - CP := cmd /c copy /Y + CP := cmd /c xcopy /E CD := cd CAT :=cat EXEC :=./ From 173efb93c034911e539c5f652a990ad267a4980d Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Wed, 1 Aug 2018 09:20:39 +0300 Subject: [PATCH 170/212] i --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3d3bcc7e3..1b99f6cc4 100644 --- a/Makefile +++ b/Makefile @@ -38,7 +38,7 @@ ifneq ("$(PROGRAMFILES)$(ProgramFiles)","") SED := sed ECHO := echo MKDIR := mkdir -p - CP := cmd /c xcopy /E + CP := cp -r CD := cd CAT :=cat EXEC :=./ From 1980e6f602ba60a7f4f1c0fc38daf5fcedd07ef8 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Wed, 1 Aug 2018 09:58:57 +0300 Subject: [PATCH 171/212] i --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 1b99f6cc4..f02d54dc2 100644 --- a/Makefile +++ b/Makefile @@ -239,7 +239,7 @@ apache22-src: apr -$(CP) apr-${APR_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache22$(PS)srclib$(PS)apr -$(CP) apr-util-${APR_UTIL_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache22$(PS)srclib$(PS)apr-util -$(RMALL) httpd-* apr-* - -$(CD) extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache22; ./configure --with-included-apr + -$(CD) extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache22; ./configure --Dwith-included-apr apachezip: CFLAGS += $(COMPILEFLAG)DSERVER_VERSION='"2.4.x"' apachezip: CONTAINER = $(strip Apache 2.4 $(OS_ARCH)$(OS_ARCH_EXT) $(subst _,,$(OS_BITS))) apachezip: clean build version apache-src apache agentadmin From e920ac77fc23aa5505ebb0add00e2acc7893dc6a Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Wed, 1 Aug 2018 11:01:36 +0300 Subject: [PATCH 172/212] i --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index f02d54dc2..1e9e4f113 100644 --- a/Makefile +++ b/Makefile @@ -230,7 +230,7 @@ apache-src: apr -$(CP) apr-${APR_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24$(PS)srclib$(PS)apr -$(CP) apr-util-${APR_UTIL_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24$(PS)srclib$(PS)apr-util -$(RMALL) httpd-* apr-* - -$(CD) extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24; ./configure --with-included-apr + -$(CD) extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24; ./configure --Dwith-included-apr apache22-src: apr -$(CURL) -O https://archive.apache.org/dist/httpd/httpd-${HTTPD22_VERSION}.tar.bz2 -$(UBZIP) httpd-${HTTPD22_VERSION}.tar.bz2; $(UTAR) httpd-${HTTPD22_VERSION}.tar @@ -239,7 +239,7 @@ apache22-src: apr -$(CP) apr-${APR_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache22$(PS)srclib$(PS)apr -$(CP) apr-util-${APR_UTIL_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache22$(PS)srclib$(PS)apr-util -$(RMALL) httpd-* apr-* - -$(CD) extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache22; ./configure --Dwith-included-apr + -$(CD) extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache22; ./configure --with-included-apr apachezip: CFLAGS += $(COMPILEFLAG)DSERVER_VERSION='"2.4.x"' apachezip: CONTAINER = $(strip Apache 2.4 $(OS_ARCH)$(OS_ARCH_EXT) $(subst _,,$(OS_BITS))) apachezip: clean build version apache-src apache agentadmin From 9053877764aec60bd6f4b07aadf03cd66214c00a Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Wed, 1 Aug 2018 11:05:16 +0300 Subject: [PATCH 173/212] i --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 1e9e4f113..c2f9b41ba 100644 --- a/Makefile +++ b/Makefile @@ -230,7 +230,8 @@ apache-src: apr -$(CP) apr-${APR_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24$(PS)srclib$(PS)apr -$(CP) apr-util-${APR_UTIL_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24$(PS)srclib$(PS)apr-util -$(RMALL) httpd-* apr-* - -$(CD) extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24; ./configure --Dwith-included-apr + -$(CD) extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24; ./configure +#--with-included-apr apache22-src: apr -$(CURL) -O https://archive.apache.org/dist/httpd/httpd-${HTTPD22_VERSION}.tar.bz2 -$(UBZIP) httpd-${HTTPD22_VERSION}.tar.bz2; $(UTAR) httpd-${HTTPD22_VERSION}.tar From ca776fbc5408cc84e9b96f01457ef968e2c3f892 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Wed, 1 Aug 2018 11:32:05 +0300 Subject: [PATCH 174/212] iLx --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index c2f9b41ba..40934b940 100644 --- a/Makefile +++ b/Makefile @@ -230,8 +230,7 @@ apache-src: apr -$(CP) apr-${APR_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24$(PS)srclib$(PS)apr -$(CP) apr-util-${APR_UTIL_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24$(PS)srclib$(PS)apr-util -$(RMALL) httpd-* apr-* - -$(CD) extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24; ./configure -#--with-included-apr + -$(CD) extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24; ./configure --with-included-apr --host=mingw32 apache22-src: apr -$(CURL) -O https://archive.apache.org/dist/httpd/httpd-${HTTPD22_VERSION}.tar.bz2 -$(UBZIP) httpd-${HTTPD22_VERSION}.tar.bz2; $(UTAR) httpd-${HTTPD22_VERSION}.tar From be63e56c80cc714aacc53d46f7f4f56b80adcc0c Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Mon, 6 Aug 2018 16:25:36 +0300 Subject: [PATCH 175/212] i --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 55e65c4b2..fd6d94b51 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -162,7 +162,7 @@ agentadmin: $(OUT_OBJS) $(ADMIN_OUT_OBJS) -$(RMALL) $(OBJDIR)$(PS)version.* $(SED) -e "s$(SUB)_FILE_NAME_$(SUB)agentadmin.exe$(SUB)g" \ -e "s$(SUB)DESCRIPTION$(SUB)\"OpenAM Web Agent Administration Utility\"$(SUB)g" \ - -e "s$(SUB)_FILE_TYPE_$(SUB)VFT_APP$(SUB)g" < source$(PS)version.rc.template > $(OBJDIR)$(PS)version.rc + -e "s$(SUB)_FILE_TYPE_$(SUB)VFT_APP$(SUB)g" source$(PS)version.rc.template >> $(OBJDIR)$(PS)version.rc $(RC) /l 0x0409 /nologo /fo $(OBJDIR)$(PS)version.res $(OBJDIR)$(PS)version.rc ${LINK} $(LDFLAGS) $(OUT_OBJS) $(ADMIN_OUT_OBJS) $(OBJDIR)$(PS)version.res /OUT:build\$@.exe /PDB:build\$@.pdb $(LIBS) ole32.lib oleaut32.lib ahadmin.lib From acf14ef9742dfd942742baf35de71bf13ea7f068 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Mon, 6 Aug 2018 16:28:07 +0300 Subject: [PATCH 176/212] i --- Makefile.windows.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index fd6d94b51..d4c193694 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -144,7 +144,7 @@ iis64: $(OUT_OBJS_64) $(IIS_OUT_OBJS_64) @$(ECHO) "[*** Creating "$@" shared library ***]" -$(RMALL) $(OBJDIR)$(PS)version.* $(SED) -e "s$(SUB)_FILE_NAME_$(SUB)mod_iis_openam_64.dll$(SUB)g" \ - -e "s$(SUB)_FILE_TYPE_$(SUB)VFT_DLL$(SUB)g" < source$(PS)version.rc.template > $(OBJDIR)$(PS)version.rc + -e "s$(SUB)_FILE_TYPE_$(SUB)VFT_DLL$(SUB)g" source$(PS)version.rc.template >> $(OBJDIR)$(PS)version.rc $(RC) /l 0x0409 /nologo /fo $(OBJDIR)$(PS)version.res $(OBJDIR)$(PS)version.rc ${LINK} $(SHARED) $(LDFLAGS) $(OUT_OBJS_64) $(IIS_OUT_OBJS_64) $(OBJDIR)\version.res /OUT:build\mod_iis_openam_64.dll /PDB:build\mod_iis_openam_64.pdb $(LIBS) /EXPORT:RegisterModule oleaut32.lib $(CP) $(OBJDIR)$(PS)mod_iis_openam_64.dll $(OBJDIR)$(PS)dist @@ -173,7 +173,7 @@ agentadmin_iis: $(OUT_OBJS) $(ADMIN_OUT_OBJS) -$(RMALL) $(OBJDIR)$(PS)version.* $(SED) -e "s$(SUB)_FILE_NAME_$(SUB)agentadmin.exe$(SUB)g" \ -e "s$(SUB)DESCRIPTION$(SUB)\"OpenAM Web Agent Administration Utility\"$(SUB)g" \ - -e "s$(SUB)_FILE_TYPE_$(SUB)VFT_APP$(SUB)g" < source$(PS)version.rc.template > $(OBJDIR)$(PS)version.rc + -e "s$(SUB)_FILE_TYPE_$(SUB)VFT_APP$(SUB)g" source$(PS)version.rc.template >> $(OBJDIR)$(PS)version.rc $(RC) /l 0x0409 /nologo /fo $(OBJDIR)$(PS)version.res $(OBJDIR)$(PS)version.rc ${LINK32} /LIBPATH:$(LIB32_SDK)\x86 /LIBPATH:$(LIB32_UCRT)\x86 /LIBPATH:$(LIB32_VC)\LIB $(LDFLAGS) $(OUT_OBJS) $(ADMIN_OUT_OBJS) $(OBJDIR)\version.res /OUT:build\agentadmin.exe /PDB:build\agentadmin.pdb $(LIBS) ole32.lib oleaut32.lib ahadmin.lib $(CP) $(OBJDIR)$(PS)agentadmin.pdb $(OBJDIR)$(PS)dist @@ -185,7 +185,7 @@ tests: clean build version test_includes $(OUT_OBJS) $(TEST_OBJECTS) -$(RMALL) $(OBJDIR)$(PS)version.* $(SED) -e "s$(SUB)_FILE_NAME_$(SUB)test.exe$(SUB)g" \ -e "s$(SUB)DESCRIPTION$(SUB)\"OpenAM Web Agent Test Utility\"$(SUB)g" \ - -e "s$(SUB)_FILE_TYPE_$(SUB)VFT_APP$(SUB)g" < source$(PS)version.rc.template > $(OBJDIR)$(PS)version.rc + -e "s$(SUB)_FILE_TYPE_$(SUB)VFT_APP$(SUB)g" source$(PS)version.rc.template >> $(OBJDIR)$(PS)version.rc $(RC) /l 0x0409 /nologo /fo $(OBJDIR)$(PS)version.res $(OBJDIR)$(PS)version.rc ${LINK} $(LDFLAGS) $(OUT_OBJS) $(TEST_OBJECTS) $(OBJDIR)$(PS)version.res /OUT:build$(PS)test.exe $(LIBS) From bdb7df101e090381e1d693ebf111742411720e74 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Mon, 6 Aug 2018 20:05:38 +0300 Subject: [PATCH 177/212] i --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index d4c193694..60f45fa19 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -173,7 +173,7 @@ agentadmin_iis: $(OUT_OBJS) $(ADMIN_OUT_OBJS) -$(RMALL) $(OBJDIR)$(PS)version.* $(SED) -e "s$(SUB)_FILE_NAME_$(SUB)agentadmin.exe$(SUB)g" \ -e "s$(SUB)DESCRIPTION$(SUB)\"OpenAM Web Agent Administration Utility\"$(SUB)g" \ - -e "s$(SUB)_FILE_TYPE_$(SUB)VFT_APP$(SUB)g" source$(PS)version.rc.template >> $(OBJDIR)$(PS)version.rc + -e "s$(SUB)_FILE_TYPE_$(SUB)VFT_APP$(SUB)g" source/version.rc.template >> $(OBJDIR)/version.rc $(RC) /l 0x0409 /nologo /fo $(OBJDIR)$(PS)version.res $(OBJDIR)$(PS)version.rc ${LINK32} /LIBPATH:$(LIB32_SDK)\x86 /LIBPATH:$(LIB32_UCRT)\x86 /LIBPATH:$(LIB32_VC)\LIB $(LDFLAGS) $(OUT_OBJS) $(ADMIN_OUT_OBJS) $(OBJDIR)\version.res /OUT:build\agentadmin.exe /PDB:build\agentadmin.pdb $(LIBS) ole32.lib oleaut32.lib ahadmin.lib $(CP) $(OBJDIR)$(PS)agentadmin.pdb $(OBJDIR)$(PS)dist From 75fd295e58352e449f9baf9031f975662bb3fc57 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Mon, 6 Aug 2018 20:13:32 +0300 Subject: [PATCH 178/212] i --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 60f45fa19..6fd8b4c2e 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -170,7 +170,7 @@ agentadmin_iis: CC = $(CC32) agentadmin_iis: LDFLAGS += /MACHINE:X86 agentadmin_iis: $(OUT_OBJS) $(ADMIN_OUT_OBJS) @$(ECHO) "[*** Creating agentadmin binary ***]" - -$(RMALL) $(OBJDIR)$(PS)version.* + -$(RMALL) $(OBJDIR)/version.* $(SED) -e "s$(SUB)_FILE_NAME_$(SUB)agentadmin.exe$(SUB)g" \ -e "s$(SUB)DESCRIPTION$(SUB)\"OpenAM Web Agent Administration Utility\"$(SUB)g" \ -e "s$(SUB)_FILE_TYPE_$(SUB)VFT_APP$(SUB)g" source/version.rc.template >> $(OBJDIR)/version.rc From 0fc1ef418d94048c92df86dddf2428020e35c868 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Mon, 6 Aug 2018 20:21:22 +0300 Subject: [PATCH 179/212] i --- Makefile.windows.mk | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 6fd8b4c2e..928146d98 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -123,7 +123,7 @@ iis32: CC = $(CC32) iis32: LDFLAGS += /MACHINE:X86 iis32: $(OUT_OBJS) $(IIS_OUT_OBJS) @$(ECHO) "[*** Creating "$@" shared library ***]" - -$(RMALL) $(OBJDIR)$(PS)version.* + -$(RMALL) $(OBJDIR)/version.* $(SED) -e "s$(SUB)_FILE_NAME_$(SUB)mod_iis_openam_32.dll$(SUB)g" \ -e "s$(SUB)_FILE_TYPE_$(SUB)VFT_DLL$(SUB)g" source/version.rc.template >> $(OBJDIR)/version.rc $(RC) /l 0x0409 /nologo /fo $(OBJDIR)$(PS)version.res $(OBJDIR)$(PS)version.rc @@ -142,9 +142,9 @@ $(IIS_OUT_OBJS_64): COMPILEOPTS += /TP iis64: LDFLAGS += /MACHINE:X64 iis64: $(OUT_OBJS_64) $(IIS_OUT_OBJS_64) @$(ECHO) "[*** Creating "$@" shared library ***]" - -$(RMALL) $(OBJDIR)$(PS)version.* + -$(RMALL) $(OBJDIR)/version.* $(SED) -e "s$(SUB)_FILE_NAME_$(SUB)mod_iis_openam_64.dll$(SUB)g" \ - -e "s$(SUB)_FILE_TYPE_$(SUB)VFT_DLL$(SUB)g" source$(PS)version.rc.template >> $(OBJDIR)$(PS)version.rc + -e "s$(SUB)_FILE_TYPE_$(SUB)VFT_DLL$(SUB)g" source/version.rc.template >> $(OBJDIR)/version.rc $(RC) /l 0x0409 /nologo /fo $(OBJDIR)$(PS)version.res $(OBJDIR)$(PS)version.rc ${LINK} $(SHARED) $(LDFLAGS) $(OUT_OBJS_64) $(IIS_OUT_OBJS_64) $(OBJDIR)\version.res /OUT:build\mod_iis_openam_64.dll /PDB:build\mod_iis_openam_64.pdb $(LIBS) /EXPORT:RegisterModule oleaut32.lib $(CP) $(OBJDIR)$(PS)mod_iis_openam_64.dll $(OBJDIR)$(PS)dist @@ -159,10 +159,10 @@ varnish3: agentadmin: $(OUT_OBJS) $(ADMIN_OUT_OBJS) @$(ECHO) "[*** Creating "$@" binary ***]" - -$(RMALL) $(OBJDIR)$(PS)version.* + -$(RMALL) $(OBJDIR)/version.* $(SED) -e "s$(SUB)_FILE_NAME_$(SUB)agentadmin.exe$(SUB)g" \ -e "s$(SUB)DESCRIPTION$(SUB)\"OpenAM Web Agent Administration Utility\"$(SUB)g" \ - -e "s$(SUB)_FILE_TYPE_$(SUB)VFT_APP$(SUB)g" source$(PS)version.rc.template >> $(OBJDIR)$(PS)version.rc + -e "s$(SUB)_FILE_TYPE_$(SUB)VFT_APP$(SUB)g" source/version.rc.template >> $(OBJDIR)/version.rc $(RC) /l 0x0409 /nologo /fo $(OBJDIR)$(PS)version.res $(OBJDIR)$(PS)version.rc ${LINK} $(LDFLAGS) $(OUT_OBJS) $(ADMIN_OUT_OBJS) $(OBJDIR)$(PS)version.res /OUT:build\$@.exe /PDB:build\$@.pdb $(LIBS) ole32.lib oleaut32.lib ahadmin.lib @@ -182,10 +182,10 @@ agentadmin_iis: $(OUT_OBJS) $(ADMIN_OUT_OBJS) tests: CFLAGS += $(COMPILEFLAG)DUNIT_TEST tests: clean build version test_includes $(OUT_OBJS) $(TEST_OBJECTS) @$(ECHO) "[***** Building "$@" binary *****]" - -$(RMALL) $(OBJDIR)$(PS)version.* + -$(RMALL) $(OBJDIR)/version.* $(SED) -e "s$(SUB)_FILE_NAME_$(SUB)test.exe$(SUB)g" \ -e "s$(SUB)DESCRIPTION$(SUB)\"OpenAM Web Agent Test Utility\"$(SUB)g" \ - -e "s$(SUB)_FILE_TYPE_$(SUB)VFT_APP$(SUB)g" source$(PS)version.rc.template >> $(OBJDIR)$(PS)version.rc + -e "s$(SUB)_FILE_TYPE_$(SUB)VFT_APP$(SUB)g" source/version.rc.template >> $(OBJDIR)/version.rc $(RC) /l 0x0409 /nologo /fo $(OBJDIR)$(PS)version.res $(OBJDIR)$(PS)version.rc ${LINK} $(LDFLAGS) $(OUT_OBJS) $(TEST_OBJECTS) $(OBJDIR)$(PS)version.res /OUT:build$(PS)test.exe $(LIBS) From d57e2e0f057f21c38709f415ad2c2a66a68791a9 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Mon, 6 Aug 2018 20:34:09 +0300 Subject: [PATCH 180/212] i --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 40934b940..7a427217d 100644 --- a/Makefile +++ b/Makefile @@ -230,7 +230,7 @@ apache-src: apr -$(CP) apr-${APR_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24$(PS)srclib$(PS)apr -$(CP) apr-util-${APR_UTIL_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24$(PS)srclib$(PS)apr-util -$(RMALL) httpd-* apr-* - -$(CD) extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24; ./configure --with-included-apr --host=mingw32 + -$(CD) extlib/$(OS_ARCH)_$(OS_MARCH)/apache24; ./configure --with-included-apr apache22-src: apr -$(CURL) -O https://archive.apache.org/dist/httpd/httpd-${HTTPD22_VERSION}.tar.bz2 -$(UBZIP) httpd-${HTTPD22_VERSION}.tar.bz2; $(UTAR) httpd-${HTTPD22_VERSION}.tar @@ -239,7 +239,7 @@ apache22-src: apr -$(CP) apr-${APR_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache22$(PS)srclib$(PS)apr -$(CP) apr-util-${APR_UTIL_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache22$(PS)srclib$(PS)apr-util -$(RMALL) httpd-* apr-* - -$(CD) extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache22; ./configure --with-included-apr + -$(CD) extlib/$(OS_ARCH)_$(OS_MARCH)/apache22; ./configure --with-included-apr apachezip: CFLAGS += $(COMPILEFLAG)DSERVER_VERSION='"2.4.x"' apachezip: CONTAINER = $(strip Apache 2.4 $(OS_ARCH)$(OS_ARCH_EXT) $(subst _,,$(OS_BITS))) apachezip: clean build version apache-src apache agentadmin From 7c8e065edee1216a83b7ccdfe74191c06595f7f0 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 7 Aug 2018 00:39:34 +0300 Subject: [PATCH 181/212] i --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7a427217d..eb4a8d28b 100644 --- a/Makefile +++ b/Makefile @@ -230,7 +230,7 @@ apache-src: apr -$(CP) apr-${APR_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24$(PS)srclib$(PS)apr -$(CP) apr-util-${APR_UTIL_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24$(PS)srclib$(PS)apr-util -$(RMALL) httpd-* apr-* - -$(CD) extlib/$(OS_ARCH)_$(OS_MARCH)/apache24; ./configure --with-included-apr + -$(CD) extlib/$(OS_ARCH)_$(OS_MARCH)/apache24; ./configure --with-included-apr --build=mingw32 apache22-src: apr -$(CURL) -O https://archive.apache.org/dist/httpd/httpd-${HTTPD22_VERSION}.tar.bz2 -$(UBZIP) httpd-${HTTPD22_VERSION}.tar.bz2; $(UTAR) httpd-${HTTPD22_VERSION}.tar From 12cdcaf2968957bdbe76043b9f08719de72ed75a Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 7 Aug 2018 10:18:17 +0300 Subject: [PATCH 182/212] i --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index eb4a8d28b..7a427217d 100644 --- a/Makefile +++ b/Makefile @@ -230,7 +230,7 @@ apache-src: apr -$(CP) apr-${APR_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24$(PS)srclib$(PS)apr -$(CP) apr-util-${APR_UTIL_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24$(PS)srclib$(PS)apr-util -$(RMALL) httpd-* apr-* - -$(CD) extlib/$(OS_ARCH)_$(OS_MARCH)/apache24; ./configure --with-included-apr --build=mingw32 + -$(CD) extlib/$(OS_ARCH)_$(OS_MARCH)/apache24; ./configure --with-included-apr apache22-src: apr -$(CURL) -O https://archive.apache.org/dist/httpd/httpd-${HTTPD22_VERSION}.tar.bz2 -$(UBZIP) httpd-${HTTPD22_VERSION}.tar.bz2; $(UTAR) httpd-${HTTPD22_VERSION}.tar From 3857a3e69b4a94affd1bb821b3fc77e46cf974cd Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Wed, 8 Aug 2018 13:19:34 +0300 Subject: [PATCH 183/212] i --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7a427217d..e480cf96e 100644 --- a/Makefile +++ b/Makefile @@ -37,7 +37,7 @@ ifneq ("$(PROGRAMFILES)$(ProgramFiles)","") RMDIR := cmd /c rmdir /S /Q SED := sed ECHO := echo - MKDIR := mkdir -p + MKDIR := mkdir CP := cp -r CD := cd CAT :=cat From dea06ad413744b957571c1152b1662465b92f0f3 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Wed, 8 Aug 2018 13:23:34 +0300 Subject: [PATCH 184/212] i --- Makefile.windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 928146d98..6599bf578 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -71,7 +71,7 @@ else CFLAGS += /MT endif -CC32:= C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\cl.exe +CC32:= C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\cl.exe LINK32:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\link.exe LIB32_VC:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC LIB32_SDK:=C:\Program\ Files\ \(x86\)\Windows\ Kits\10\Lib\10.0.14393.0\um From fd0b9290ae6754c7470d9f10943b6b479206b00d Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Wed, 8 Aug 2018 13:26:03 +0300 Subject: [PATCH 185/212] i --- Makefile.windows.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 6599bf578..c3af9654f 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -71,11 +71,11 @@ else CFLAGS += /MT endif -CC32:= C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\cl.exe -LINK32:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\link.exe -LIB32_VC:=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC -LIB32_SDK:=C:\Program\ Files\ \(x86\)\Windows\ Kits\10\Lib\10.0.14393.0\um -LIB32_UCRT=C:\Program\ Files\ \(x86\)\Windows\ Kits\10\lib\10.0.14393.0\ucrt +CC32:=C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\cl.exe +LINK32:=C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\link.exe +LIB32_VC:=C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC +LIB32_SDK:=C:\Program Files (x86)\Windows Kits\10\Lib\10.0.14393.0\um +LIB32_UCRT=C:\Program Files (x86)\Windows Kits\10\lib\10.0.14393.0\ucrt #CC=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\x86_amd64\cl.exe #LINK=C:\Program\ Files\ \(x86\)\Microsoft\ Visual\ Studio\ 14.0\VC\bin\x86_amd64\link.exe From ba935ab07d277de30d0ab390c6c5faa7cbdb4fca Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Wed, 8 Aug 2018 13:48:06 +0300 Subject: [PATCH 186/212] i --- Makefile.windows.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index c3af9654f..3632e05a7 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -127,7 +127,7 @@ iis32: $(OUT_OBJS) $(IIS_OUT_OBJS) $(SED) -e "s$(SUB)_FILE_NAME_$(SUB)mod_iis_openam_32.dll$(SUB)g" \ -e "s$(SUB)_FILE_TYPE_$(SUB)VFT_DLL$(SUB)g" source/version.rc.template >> $(OBJDIR)/version.rc $(RC) /l 0x0409 /nologo /fo $(OBJDIR)$(PS)version.res $(OBJDIR)$(PS)version.rc - $(LINK32) $(SHARED) /LIBPATH:$(LIB32_SDK)\x86 /LIBPATH:$(LIB32_UCRT)\x86 /LIBPATH:$(LIB32_VC)\lib $(LDFLAGS) $(OUT_OBJS) $(IIS_OUT_OBJS) $(OBJDIR)/version.res /OUT:build/mod_iis_openam_32.dll /PDB:build/mod_iis_openam_32.pdb $(LIBS) /EXPORT:RegisterModule oleaut32.lib + $(LINK32) $(SHARED) /LIBPATH:"$(LIB32_SDK)\x86" /LIBPATH:"$(LIB32_UCRT)\x86" /LIBPATH:"$(LIB32_VC)\lib" $(LDFLAGS) $(OUT_OBJS) $(IIS_OUT_OBJS) $(OBJDIR)/version.res /OUT:build/mod_iis_openam_32.dll /PDB:build/mod_iis_openam_32.pdb $(LIBS) /EXPORT:RegisterModule oleaut32.lib $(CP) $(OBJDIR)$(PS)mod_iis_openam_32.dll $(OBJDIR)$(PS)dist $(CP) $(OBJDIR)$(PS)mod_iis_openam_32.pdb $(OBJDIR)$(PS)dist @@ -175,7 +175,7 @@ agentadmin_iis: $(OUT_OBJS) $(ADMIN_OUT_OBJS) -e "s$(SUB)DESCRIPTION$(SUB)\"OpenAM Web Agent Administration Utility\"$(SUB)g" \ -e "s$(SUB)_FILE_TYPE_$(SUB)VFT_APP$(SUB)g" source/version.rc.template >> $(OBJDIR)/version.rc $(RC) /l 0x0409 /nologo /fo $(OBJDIR)$(PS)version.res $(OBJDIR)$(PS)version.rc - ${LINK32} /LIBPATH:$(LIB32_SDK)\x86 /LIBPATH:$(LIB32_UCRT)\x86 /LIBPATH:$(LIB32_VC)\LIB $(LDFLAGS) $(OUT_OBJS) $(ADMIN_OUT_OBJS) $(OBJDIR)\version.res /OUT:build\agentadmin.exe /PDB:build\agentadmin.pdb $(LIBS) ole32.lib oleaut32.lib ahadmin.lib + ${LINK32} /LIBPATH:"$(LIB32_SDK)\x86" /LIBPATH:"$(LIB32_UCRT)\x86" /LIBPATH:"$(LIB32_VC)\LIB" $(LDFLAGS) $(OUT_OBJS) $(ADMIN_OUT_OBJS) $(OBJDIR)\version.res /OUT:build\agentadmin.exe /PDB:build\agentadmin.pdb $(LIBS) ole32.lib oleaut32.lib ahadmin.lib $(CP) $(OBJDIR)$(PS)agentadmin.pdb $(OBJDIR)$(PS)dist $(CP) $(OBJDIR)$(PS)agentadmin.exe $(OBJDIR)$(PS)dist From 444883e24c290cef840a6eddb5d95cd98ea4b73e Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Wed, 8 Aug 2018 14:48:21 +0300 Subject: [PATCH 187/212] i --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e480cf96e..c683c8679 100644 --- a/Makefile +++ b/Makefile @@ -38,10 +38,10 @@ ifneq ("$(PROGRAMFILES)$(ProgramFiles)","") SED := sed ECHO := echo MKDIR := mkdir - CP := cp -r + CP := xcopy /s /e /y CD := cd CAT :=cat - EXEC :=./ + EXEC := REVISION := Revision: $(shell git rev-parse --short HEAD) BUILD_MACHINE := $(shell hostname) IDENT_DATE := $(shell powershell get-date -format "{dd.MM.yyyy}") From 9f39b72225f20150ad3bcb4f65516c4016995084 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Wed, 8 Aug 2018 14:51:15 +0300 Subject: [PATCH 188/212] i --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c683c8679..fcca39321 100644 --- a/Makefile +++ b/Makefile @@ -38,7 +38,7 @@ ifneq ("$(PROGRAMFILES)$(ProgramFiles)","") SED := sed ECHO := echo MKDIR := mkdir - CP := xcopy /s /e /y + CP := cmd /c xcopy /s /e /y CD := cd CAT :=cat EXEC := From 4bd101748999b99912398fdca24c611cc55cfe1b Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Wed, 8 Aug 2018 14:55:47 +0300 Subject: [PATCH 189/212] i --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index fcca39321..af0a4e179 100644 --- a/Makefile +++ b/Makefile @@ -33,12 +33,12 @@ VERSION := 4.1.0 ifneq ("$(PROGRAMFILES)$(ProgramFiles)","") OS_ARCH := WINNT - RMALL := rm -rf + RMALL := cmd /c del /F /Q RMDIR := cmd /c rmdir /S /Q SED := sed ECHO := echo - MKDIR := mkdir - CP := cmd /c xcopy /s /e /y + MKDIR := cmd /c mkdir + CP := cmd /c xcopy /e /y CD := cd CAT :=cat EXEC := From fbf00713aae8fd867be8ed35cc83618485cc3a1f Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Wed, 8 Aug 2018 14:59:37 +0300 Subject: [PATCH 190/212] i --- Makefile | 2 +- Makefile.windows.mk | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index af0a4e179..ba6e05978 100644 --- a/Makefile +++ b/Makefile @@ -38,7 +38,7 @@ ifneq ("$(PROGRAMFILES)$(ProgramFiles)","") SED := sed ECHO := echo MKDIR := cmd /c mkdir - CP := cmd /c xcopy /e /y + CP := cmd /c xcopy /s /y CD := cd CAT :=cat EXEC := diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 3632e05a7..57ba864e1 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -113,12 +113,12 @@ apache22: apache22_pre $(OUT_OBJS) $(APACHE22_OUT_OBJS) apache22_post iis: iis32 agentadmin_iis iisclean iis64 iisclean: - -$(RMALL) $(OBJDIR)/*.* - -$(RMALL) $(OBJDIR)/expat/* - -$(RMALL) $(OBJDIR)/pcre/* - -$(RMALL) $(OBJDIR)/zlib/* - -$(RMALL) $(OBJDIR)/source/* - -$(RMALL) $(OBJDIR)/source/iis/* + -$(RMALL) $(OBJDIR)$(PS)*.* + -$(RMALL) $(OBJDIR)$(PS)expat$(PS)* + -$(RMALL) $(OBJDIR)$(PS)pcre$(PS)* + -$(RMALL) $(OBJDIR)$(PS)zlib$(PS)* + -$(RMALL) $(OBJDIR)$(PS)source$(PS)* + -$(RMALL) $(OBJDIR)$(PS)source$(PS)iis$(PS)* iis32: CC = $(CC32) iis32: LDFLAGS += /MACHINE:X86 iis32: $(OUT_OBJS) $(IIS_OUT_OBJS) From cde3086655b76d3da606b28d62422bb7762d5f11 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Wed, 8 Aug 2018 15:04:10 +0300 Subject: [PATCH 191/212] i --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ba6e05978..595f6b48d 100644 --- a/Makefile +++ b/Makefile @@ -38,7 +38,7 @@ ifneq ("$(PROGRAMFILES)$(ProgramFiles)","") SED := sed ECHO := echo MKDIR := cmd /c mkdir - CP := cmd /c xcopy /s /y + CP := cmd /c copy /Y CD := cd CAT :=cat EXEC := From 2dcd86b0de31b4def1c749845e75ab0e9da7b364 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Wed, 8 Aug 2018 15:07:11 +0300 Subject: [PATCH 192/212] i --- Makefile.windows.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile.windows.mk b/Makefile.windows.mk index 57ba864e1..b8b99140d 100644 --- a/Makefile.windows.mk +++ b/Makefile.windows.mk @@ -123,7 +123,7 @@ iis32: CC = $(CC32) iis32: LDFLAGS += /MACHINE:X86 iis32: $(OUT_OBJS) $(IIS_OUT_OBJS) @$(ECHO) "[*** Creating "$@" shared library ***]" - -$(RMALL) $(OBJDIR)/version.* + -$(RMALL) $(OBJDIR)$(PS)version.* $(SED) -e "s$(SUB)_FILE_NAME_$(SUB)mod_iis_openam_32.dll$(SUB)g" \ -e "s$(SUB)_FILE_TYPE_$(SUB)VFT_DLL$(SUB)g" source/version.rc.template >> $(OBJDIR)/version.rc $(RC) /l 0x0409 /nologo /fo $(OBJDIR)$(PS)version.res $(OBJDIR)$(PS)version.rc @@ -142,7 +142,7 @@ $(IIS_OUT_OBJS_64): COMPILEOPTS += /TP iis64: LDFLAGS += /MACHINE:X64 iis64: $(OUT_OBJS_64) $(IIS_OUT_OBJS_64) @$(ECHO) "[*** Creating "$@" shared library ***]" - -$(RMALL) $(OBJDIR)/version.* + -$(RMALL) $(OBJDIR)$(PS)version.* $(SED) -e "s$(SUB)_FILE_NAME_$(SUB)mod_iis_openam_64.dll$(SUB)g" \ -e "s$(SUB)_FILE_TYPE_$(SUB)VFT_DLL$(SUB)g" source/version.rc.template >> $(OBJDIR)/version.rc $(RC) /l 0x0409 /nologo /fo $(OBJDIR)$(PS)version.res $(OBJDIR)$(PS)version.rc @@ -159,7 +159,7 @@ varnish3: agentadmin: $(OUT_OBJS) $(ADMIN_OUT_OBJS) @$(ECHO) "[*** Creating "$@" binary ***]" - -$(RMALL) $(OBJDIR)/version.* + -$(RMALL) $(OBJDIR)$(PS)version.* $(SED) -e "s$(SUB)_FILE_NAME_$(SUB)agentadmin.exe$(SUB)g" \ -e "s$(SUB)DESCRIPTION$(SUB)\"OpenAM Web Agent Administration Utility\"$(SUB)g" \ -e "s$(SUB)_FILE_TYPE_$(SUB)VFT_APP$(SUB)g" source/version.rc.template >> $(OBJDIR)/version.rc @@ -170,7 +170,7 @@ agentadmin_iis: CC = $(CC32) agentadmin_iis: LDFLAGS += /MACHINE:X86 agentadmin_iis: $(OUT_OBJS) $(ADMIN_OUT_OBJS) @$(ECHO) "[*** Creating agentadmin binary ***]" - -$(RMALL) $(OBJDIR)/version.* + -$(RMALL) $(OBJDIR)$(PS)version.* $(SED) -e "s$(SUB)_FILE_NAME_$(SUB)agentadmin.exe$(SUB)g" \ -e "s$(SUB)DESCRIPTION$(SUB)\"OpenAM Web Agent Administration Utility\"$(SUB)g" \ -e "s$(SUB)_FILE_TYPE_$(SUB)VFT_APP$(SUB)g" source/version.rc.template >> $(OBJDIR)/version.rc @@ -182,7 +182,7 @@ agentadmin_iis: $(OUT_OBJS) $(ADMIN_OUT_OBJS) tests: CFLAGS += $(COMPILEFLAG)DUNIT_TEST tests: clean build version test_includes $(OUT_OBJS) $(TEST_OBJECTS) @$(ECHO) "[***** Building "$@" binary *****]" - -$(RMALL) $(OBJDIR)/version.* + -$(RMALL) $(OBJDIR)$(PS)version.* $(SED) -e "s$(SUB)_FILE_NAME_$(SUB)test.exe$(SUB)g" \ -e "s$(SUB)DESCRIPTION$(SUB)\"OpenAM Web Agent Test Utility\"$(SUB)g" \ -e "s$(SUB)_FILE_TYPE_$(SUB)VFT_APP$(SUB)g" source/version.rc.template >> $(OBJDIR)/version.rc From 37a9e96812e7d6e94bbb4d7d67d1f29419c3cded Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Wed, 8 Aug 2018 15:15:28 +0300 Subject: [PATCH 193/212] i --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 595f6b48d..9d66168dc 100644 --- a/Makefile +++ b/Makefile @@ -52,7 +52,7 @@ ifneq ("$(PROGRAMFILES)$(ProgramFiles)","") OBJ=obj UTAR=7z x UBZIP=7z x - CURL=curl + CURL=cmd /c curl else OS_ARCH := $(shell uname -s) OS_MARCH := $(shell uname -m) From e9853e5a44cc6c8438ced46a5253dd19de8c6391 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Wed, 8 Aug 2018 15:23:50 +0300 Subject: [PATCH 194/212] i --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 9d66168dc..18090a12b 100644 --- a/Makefile +++ b/Makefile @@ -52,7 +52,7 @@ ifneq ("$(PROGRAMFILES)$(ProgramFiles)","") OBJ=obj UTAR=7z x UBZIP=7z x - CURL=cmd /c curl + CURL=curl else OS_ARCH := $(shell uname -s) OS_MARCH := $(shell uname -m) @@ -218,12 +218,12 @@ test_includes: $(SED) -ie "s$(SUB)\"$(SUB) $(SUB)g" $(OBJDIR)$(PS)tests$(PS)tests.h apr: - -$(CURL) -O http://mirrors.ukfast.co.uk/sites/ftp.apache.org/apr/apr-${APR_VERSION}.tar.bz2 + -$(CURL) --remote-name http://mirrors.ukfast.co.uk/sites/ftp.apache.org/apr/apr-${APR_VERSION}.tar.bz2 -$(UBZIP) apr-${APR_VERSION}.tar.bz2; $(UTAR) apr-${APR_VERSION}.tar - -$(CURL) -O http://mirrors.ukfast.co.uk/sites/ftp.apache.org/apr/apr-util-${APR_UTIL_VERSION}.tar.bz2 + -$(CURL) --remote-name http://mirrors.ukfast.co.uk/sites/ftp.apache.org/apr/apr-util-${APR_UTIL_VERSION}.tar.bz2 -$(UBZIP) apr-util-${APR_UTIL_VERSION}.tar.bz2; $(UTAR) apr-util-${APR_UTIL_VERSION}.tar apache-src: apr - -$(CURL) -O http://mirrors.ukfast.co.uk/sites/ftp.apache.org/httpd/httpd-${HTTPD24_VERSION}.tar.bz2 + -$(CURL) --remote-name http://mirrors.ukfast.co.uk/sites/ftp.apache.org/httpd/httpd-${HTTPD24_VERSION}.tar.bz2 -$(UBZIP) httpd-${HTTPD24_VERSION}.tar.bz2; $(UTAR) httpd-${HTTPD24_VERSION}.tar -$(MKDIR) extlib/$(OS_ARCH)_$(OS_MARCH) -$(CP) httpd-${HTTPD24_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24 @@ -232,7 +232,7 @@ apache-src: apr -$(RMALL) httpd-* apr-* -$(CD) extlib/$(OS_ARCH)_$(OS_MARCH)/apache24; ./configure --with-included-apr apache22-src: apr - -$(CURL) -O https://archive.apache.org/dist/httpd/httpd-${HTTPD22_VERSION}.tar.bz2 + -$(CURL) --remote-name https://archive.apache.org/dist/httpd/httpd-${HTTPD22_VERSION}.tar.bz2 -$(UBZIP) httpd-${HTTPD22_VERSION}.tar.bz2; $(UTAR) httpd-${HTTPD22_VERSION}.tar -$(MKDIR) extlib/$(OS_ARCH)_$(OS_MARCH) -$(CP) httpd-${HTTPD22_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache22 From ee5f730850150232b2371f2cf099c2e161d033f3 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Wed, 8 Aug 2018 16:27:14 +0300 Subject: [PATCH 195/212] i --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 18090a12b..cd1342998 100644 --- a/Makefile +++ b/Makefile @@ -218,12 +218,12 @@ test_includes: $(SED) -ie "s$(SUB)\"$(SUB) $(SUB)g" $(OBJDIR)$(PS)tests$(PS)tests.h apr: - -$(CURL) --remote-name http://mirrors.ukfast.co.uk/sites/ftp.apache.org/apr/apr-${APR_VERSION}.tar.bz2 + -$(CURL) --remote-name "http://mirrors.ukfast.co.uk/sites/ftp.apache.org/apr/apr-${APR_VERSION}.tar.bz2" -$(UBZIP) apr-${APR_VERSION}.tar.bz2; $(UTAR) apr-${APR_VERSION}.tar - -$(CURL) --remote-name http://mirrors.ukfast.co.uk/sites/ftp.apache.org/apr/apr-util-${APR_UTIL_VERSION}.tar.bz2 + -$(CURL) --remote-name "http://mirrors.ukfast.co.uk/sites/ftp.apache.org/apr/apr-util-${APR_UTIL_VERSION}.tar.bz2" -$(UBZIP) apr-util-${APR_UTIL_VERSION}.tar.bz2; $(UTAR) apr-util-${APR_UTIL_VERSION}.tar apache-src: apr - -$(CURL) --remote-name http://mirrors.ukfast.co.uk/sites/ftp.apache.org/httpd/httpd-${HTTPD24_VERSION}.tar.bz2 + -$(CURL) --remote-name "http://mirrors.ukfast.co.uk/sites/ftp.apache.org/httpd/httpd-${HTTPD24_VERSION}.tar.bz2" -$(UBZIP) httpd-${HTTPD24_VERSION}.tar.bz2; $(UTAR) httpd-${HTTPD24_VERSION}.tar -$(MKDIR) extlib/$(OS_ARCH)_$(OS_MARCH) -$(CP) httpd-${HTTPD24_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24 @@ -232,7 +232,7 @@ apache-src: apr -$(RMALL) httpd-* apr-* -$(CD) extlib/$(OS_ARCH)_$(OS_MARCH)/apache24; ./configure --with-included-apr apache22-src: apr - -$(CURL) --remote-name https://archive.apache.org/dist/httpd/httpd-${HTTPD22_VERSION}.tar.bz2 + -$(CURL) --remote-name "https://archive.apache.org/dist/httpd/httpd-${HTTPD22_VERSION}.tar.bz2" -$(UBZIP) httpd-${HTTPD22_VERSION}.tar.bz2; $(UTAR) httpd-${HTTPD22_VERSION}.tar -$(MKDIR) extlib/$(OS_ARCH)_$(OS_MARCH) -$(CP) httpd-${HTTPD22_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache22 From 56db3e85bde4e1690e02a9941c6080ac43f065d9 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Wed, 8 Aug 2018 16:35:45 +0300 Subject: [PATCH 196/212] i --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index cd1342998..c7ed966f7 100644 --- a/Makefile +++ b/Makefile @@ -218,7 +218,7 @@ test_includes: $(SED) -ie "s$(SUB)\"$(SUB) $(SUB)g" $(OBJDIR)$(PS)tests$(PS)tests.h apr: - -$(CURL) --remote-name "http://mirrors.ukfast.co.uk/sites/ftp.apache.org/apr/apr-${APR_VERSION}.tar.bz2" + -$(CURL) http://mirrors.ukfast.co.uk/sites/ftp.apache.org/apr/apr-${APR_VERSION}.tar.bz2 -o apr-${APR_VERSION}.tar.bz2 -$(UBZIP) apr-${APR_VERSION}.tar.bz2; $(UTAR) apr-${APR_VERSION}.tar -$(CURL) --remote-name "http://mirrors.ukfast.co.uk/sites/ftp.apache.org/apr/apr-util-${APR_UTIL_VERSION}.tar.bz2" -$(UBZIP) apr-util-${APR_UTIL_VERSION}.tar.bz2; $(UTAR) apr-util-${APR_UTIL_VERSION}.tar From dc1c6f958603d5f76b0458d24048fdae1e6fdbde Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Wed, 8 Aug 2018 16:39:35 +0300 Subject: [PATCH 197/212] i --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index c7ed966f7..29ae69abf 100644 --- a/Makefile +++ b/Makefile @@ -50,9 +50,9 @@ ifneq ("$(PROGRAMFILES)$(ProgramFiles)","") COMPILEFLAG=/ COMPILEOPTS=/Fd$@.pdb /Fo$(dir $@) OBJ=obj - UTAR=7z x - UBZIP=7z x - CURL=curl + UTAR=cmd /c 7z x + UBZIP=cmd /c 7z x + CURL=cmd /c curl else OS_ARCH := $(shell uname -s) OS_MARCH := $(shell uname -m) @@ -218,7 +218,7 @@ test_includes: $(SED) -ie "s$(SUB)\"$(SUB) $(SUB)g" $(OBJDIR)$(PS)tests$(PS)tests.h apr: - -$(CURL) http://mirrors.ukfast.co.uk/sites/ftp.apache.org/apr/apr-${APR_VERSION}.tar.bz2 -o apr-${APR_VERSION}.tar.bz2 + -$(CURL) -O http://mirrors.ukfast.co.uk/sites/ftp.apache.org/apr/apr-${APR_VERSION}.tar.bz2 -$(UBZIP) apr-${APR_VERSION}.tar.bz2; $(UTAR) apr-${APR_VERSION}.tar -$(CURL) --remote-name "http://mirrors.ukfast.co.uk/sites/ftp.apache.org/apr/apr-util-${APR_UTIL_VERSION}.tar.bz2" -$(UBZIP) apr-util-${APR_UTIL_VERSION}.tar.bz2; $(UTAR) apr-util-${APR_UTIL_VERSION}.tar From 42803bf936c7fbe1e7eb7fa859d3f4712bff7ff0 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Wed, 8 Aug 2018 16:44:33 +0300 Subject: [PATCH 198/212] i --- Makefile | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 29ae69abf..4c7ef533c 100644 --- a/Makefile +++ b/Makefile @@ -219,12 +219,15 @@ test_includes: apr: -$(CURL) -O http://mirrors.ukfast.co.uk/sites/ftp.apache.org/apr/apr-${APR_VERSION}.tar.bz2 - -$(UBZIP) apr-${APR_VERSION}.tar.bz2; $(UTAR) apr-${APR_VERSION}.tar - -$(CURL) --remote-name "http://mirrors.ukfast.co.uk/sites/ftp.apache.org/apr/apr-util-${APR_UTIL_VERSION}.tar.bz2" - -$(UBZIP) apr-util-${APR_UTIL_VERSION}.tar.bz2; $(UTAR) apr-util-${APR_UTIL_VERSION}.tar + -$(UBZIP) apr-${APR_VERSION}.tar.bz2 + -$(UTAR) apr-${APR_VERSION}.tar + -$(CURL) -O http://mirrors.ukfast.co.uk/sites/ftp.apache.org/apr/apr-util-${APR_UTIL_VERSION}.tar.bz2 + -$(UBZIP) apr-util-${APR_UTIL_VERSION}.tar.bz2 + -$(UTAR) apr-util-${APR_UTIL_VERSION}.tar apache-src: apr - -$(CURL) --remote-name "http://mirrors.ukfast.co.uk/sites/ftp.apache.org/httpd/httpd-${HTTPD24_VERSION}.tar.bz2" - -$(UBZIP) httpd-${HTTPD24_VERSION}.tar.bz2; $(UTAR) httpd-${HTTPD24_VERSION}.tar + -$(CURL) -O http://mirrors.ukfast.co.uk/sites/ftp.apache.org/httpd/httpd-${HTTPD24_VERSION}.tar.bz2 + -$(UBZIP) httpd-${HTTPD24_VERSION}.tar.bz2 + -$(UTAR) httpd-${HTTPD24_VERSION}.tar -$(MKDIR) extlib/$(OS_ARCH)_$(OS_MARCH) -$(CP) httpd-${HTTPD24_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24 -$(CP) apr-${APR_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24$(PS)srclib$(PS)apr @@ -232,8 +235,9 @@ apache-src: apr -$(RMALL) httpd-* apr-* -$(CD) extlib/$(OS_ARCH)_$(OS_MARCH)/apache24; ./configure --with-included-apr apache22-src: apr - -$(CURL) --remote-name "https://archive.apache.org/dist/httpd/httpd-${HTTPD22_VERSION}.tar.bz2" - -$(UBZIP) httpd-${HTTPD22_VERSION}.tar.bz2; $(UTAR) httpd-${HTTPD22_VERSION}.tar + -$(CURL) -O https://archive.apache.org/dist/httpd/httpd-${HTTPD22_VERSION}.tar.bz2 + -$(UBZIP) httpd-${HTTPD22_VERSION}.tar.bz2 + -$(UTAR) httpd-${HTTPD22_VERSION}.tar -$(MKDIR) extlib/$(OS_ARCH)_$(OS_MARCH) -$(CP) httpd-${HTTPD22_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache22 -$(CP) apr-${APR_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache22$(PS)srclib$(PS)apr From fb742f871795a59d89136c4335a1a5714f09f8ce Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Wed, 8 Aug 2018 16:47:46 +0300 Subject: [PATCH 199/212] ii --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 4c7ef533c..4e9a5ff69 100644 --- a/Makefile +++ b/Makefile @@ -228,7 +228,7 @@ apache-src: apr -$(CURL) -O http://mirrors.ukfast.co.uk/sites/ftp.apache.org/httpd/httpd-${HTTPD24_VERSION}.tar.bz2 -$(UBZIP) httpd-${HTTPD24_VERSION}.tar.bz2 -$(UTAR) httpd-${HTTPD24_VERSION}.tar - -$(MKDIR) extlib/$(OS_ARCH)_$(OS_MARCH) + -$(MKDIR) extlib$(PS)$(OS_ARCH)_$(OS_MARCH) -$(CP) httpd-${HTTPD24_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24 -$(CP) apr-${APR_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24$(PS)srclib$(PS)apr -$(CP) apr-util-${APR_UTIL_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24$(PS)srclib$(PS)apr-util From 61a62be30047800d433378f41c7debf6859b2fea Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Wed, 8 Aug 2018 16:50:27 +0300 Subject: [PATCH 200/212] i --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index 4e9a5ff69..9fb94b0b2 100644 --- a/Makefile +++ b/Makefile @@ -230,6 +230,7 @@ apache-src: apr -$(UTAR) httpd-${HTTPD24_VERSION}.tar -$(MKDIR) extlib$(PS)$(OS_ARCH)_$(OS_MARCH) -$(CP) httpd-${HTTPD24_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24 + -$(MKDIR) extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24$(PS)srclib -$(CP) apr-${APR_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24$(PS)srclib$(PS)apr -$(CP) apr-util-${APR_UTIL_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24$(PS)srclib$(PS)apr-util -$(RMALL) httpd-* apr-* @@ -240,6 +241,7 @@ apache22-src: apr -$(UTAR) httpd-${HTTPD22_VERSION}.tar -$(MKDIR) extlib/$(OS_ARCH)_$(OS_MARCH) -$(CP) httpd-${HTTPD22_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache22 + -$(MKDIR) extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache22$(PS)srclib -$(CP) apr-${APR_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache22$(PS)srclib$(PS)apr -$(CP) apr-util-${APR_UTIL_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache22$(PS)srclib$(PS)apr-util -$(RMALL) httpd-* apr-* From 89d41737f27005c952c131c11bcb12fedf0449d5 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Wed, 8 Aug 2018 17:29:26 +0300 Subject: [PATCH 201/212] i --- Makefile | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 9fb94b0b2..2b4af85cc 100644 --- a/Makefile +++ b/Makefile @@ -39,6 +39,7 @@ ifneq ("$(PROGRAMFILES)$(ProgramFiles)","") ECHO := echo MKDIR := cmd /c mkdir CP := cmd /c copy /Y + MV : cmd /c move /Y CD := cd CAT :=cat EXEC := @@ -61,7 +62,8 @@ else SED := sed ECHO := echo MKDIR := mkdir -p - CP := cp -r + CP := cp -r + MV :=mv -f CD := cd EXEC := ./ REVISION := Revision: $(shell git rev-parse --short HEAD) @@ -229,22 +231,20 @@ apache-src: apr -$(UBZIP) httpd-${HTTPD24_VERSION}.tar.bz2 -$(UTAR) httpd-${HTTPD24_VERSION}.tar -$(MKDIR) extlib$(PS)$(OS_ARCH)_$(OS_MARCH) - -$(CP) httpd-${HTTPD24_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24 + -$(MV) httpd-${HTTPD24_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24 -$(MKDIR) extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24$(PS)srclib - -$(CP) apr-${APR_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24$(PS)srclib$(PS)apr - -$(CP) apr-util-${APR_UTIL_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24$(PS)srclib$(PS)apr-util - -$(RMALL) httpd-* apr-* - -$(CD) extlib/$(OS_ARCH)_$(OS_MARCH)/apache24; ./configure --with-included-apr + -$(MV) apr-${APR_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24$(PS)srclib$(PS)apr + -$(MV) apr-util-${APR_UTIL_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24$(PS)srclib$(PS)apr-util + -$(CD) extlib/$(OS_ARCH)_$(OS_MARCH)/apache24 && ./configure --with-included-apr apache22-src: apr -$(CURL) -O https://archive.apache.org/dist/httpd/httpd-${HTTPD22_VERSION}.tar.bz2 -$(UBZIP) httpd-${HTTPD22_VERSION}.tar.bz2 -$(UTAR) httpd-${HTTPD22_VERSION}.tar -$(MKDIR) extlib/$(OS_ARCH)_$(OS_MARCH) - -$(CP) httpd-${HTTPD22_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache22 + -$(MV) httpd-${HTTPD22_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache22 -$(MKDIR) extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache22$(PS)srclib - -$(CP) apr-${APR_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache22$(PS)srclib$(PS)apr - -$(CP) apr-util-${APR_UTIL_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache22$(PS)srclib$(PS)apr-util - -$(RMALL) httpd-* apr-* + -$(MV) apr-${APR_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache22$(PS)srclib$(PS)apr + -$(MV) apr-util-${APR_UTIL_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache22$(PS)srclib$(PS)apr-util -$(CD) extlib/$(OS_ARCH)_$(OS_MARCH)/apache22; ./configure --with-included-apr apachezip: CFLAGS += $(COMPILEFLAG)DSERVER_VERSION='"2.4.x"' apachezip: CONTAINER = $(strip Apache 2.4 $(OS_ARCH)$(OS_ARCH_EXT) $(subst _,,$(OS_BITS))) From 6777984c13fc53657057b888b5c94b291ddc7113 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Wed, 8 Aug 2018 17:46:18 +0300 Subject: [PATCH 202/212] i: --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 2b4af85cc..72b7a1c34 100644 --- a/Makefile +++ b/Makefile @@ -39,7 +39,7 @@ ifneq ("$(PROGRAMFILES)$(ProgramFiles)","") ECHO := echo MKDIR := cmd /c mkdir CP := cmd /c copy /Y - MV : cmd /c move /Y + MV := cmd /c move /Y CD := cd CAT :=cat EXEC := From 665c5924cbf6d90fb969a2578a986763ce2d8565 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Wed, 8 Aug 2018 19:37:58 +0300 Subject: [PATCH 203/212] i --- Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 72b7a1c34..eed29b6a8 100644 --- a/Makefile +++ b/Makefile @@ -53,7 +53,8 @@ ifneq ("$(PROGRAMFILES)$(ProgramFiles)","") OBJ=obj UTAR=cmd /c 7z x UBZIP=cmd /c 7z x - CURL=cmd /c curl + CURL=cmd /c curl + CE=--build=x86_64-pc-mingw32 else OS_ARCH := $(shell uname -s) OS_MARCH := $(shell uname -m) @@ -78,6 +79,7 @@ else UBZIP=bunzip2 CURL=curl CAT=cat + CE= endif SED_ROPT := r @@ -235,7 +237,7 @@ apache-src: apr -$(MKDIR) extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24$(PS)srclib -$(MV) apr-${APR_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24$(PS)srclib$(PS)apr -$(MV) apr-util-${APR_UTIL_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24$(PS)srclib$(PS)apr-util - -$(CD) extlib/$(OS_ARCH)_$(OS_MARCH)/apache24 && ./configure --with-included-apr + -$(CD) extlib/$(OS_ARCH)_$(OS_MARCH)/apache24 && sh configure --with-included-apr $(CE) apache22-src: apr -$(CURL) -O https://archive.apache.org/dist/httpd/httpd-${HTTPD22_VERSION}.tar.bz2 -$(UBZIP) httpd-${HTTPD22_VERSION}.tar.bz2 @@ -245,7 +247,7 @@ apache22-src: apr -$(MKDIR) extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache22$(PS)srclib -$(MV) apr-${APR_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache22$(PS)srclib$(PS)apr -$(MV) apr-util-${APR_UTIL_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache22$(PS)srclib$(PS)apr-util - -$(CD) extlib/$(OS_ARCH)_$(OS_MARCH)/apache22; ./configure --with-included-apr + -$(CD) extlib/$(OS_ARCH)_$(OS_MARCH)/apache22; sh configure --with-included-apr $(CE) apachezip: CFLAGS += $(COMPILEFLAG)DSERVER_VERSION='"2.4.x"' apachezip: CONTAINER = $(strip Apache 2.4 $(OS_ARCH)$(OS_ARCH_EXT) $(subst _,,$(OS_BITS))) apachezip: clean build version apache-src apache agentadmin From fd8f7e9f08e148e562b06899189ac566a9a4ef24 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Wed, 8 Aug 2018 20:07:35 +0300 Subject: [PATCH 204/212] i --- Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile index eed29b6a8..e3b7df2cc 100644 --- a/Makefile +++ b/Makefile @@ -236,6 +236,9 @@ apache-src: apr -$(MV) httpd-${HTTPD24_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24 -$(MKDIR) extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24$(PS)srclib -$(MV) apr-${APR_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24$(PS)srclib$(PS)apr +ifneq ("$(PROGRAMFILES)$(ProgramFiles)","") + -$(CD) extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24$(PS)srclib$(PS)apr && $(CURL) -O https://raw.githubusercontent.com/Alexpux/MINGW-packages/master/mingw-w64-apr/apr_ssize_t.patch && patch -p0 -i apr_ssize_t.patch +endif -$(MV) apr-util-${APR_UTIL_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24$(PS)srclib$(PS)apr-util -$(CD) extlib/$(OS_ARCH)_$(OS_MARCH)/apache24 && sh configure --with-included-apr $(CE) apache22-src: apr From 87100b5d8db80db57383af27482472a3752842f0 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Thu, 9 Aug 2018 08:01:03 +0300 Subject: [PATCH 205/212] i --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index e3b7df2cc..b27fd76d8 100644 --- a/Makefile +++ b/Makefile @@ -238,6 +238,7 @@ apache-src: apr -$(MV) apr-${APR_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24$(PS)srclib$(PS)apr ifneq ("$(PROGRAMFILES)$(ProgramFiles)","") -$(CD) extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24$(PS)srclib$(PS)apr && $(CURL) -O https://raw.githubusercontent.com/Alexpux/MINGW-packages/master/mingw-w64-apr/apr_ssize_t.patch && patch -p0 -i apr_ssize_t.patch + -$(CD) extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24$(PS)srclib$(PS)apr && $(CURL) -O https://raw.githubusercontent.com/Alexpux/MINGW-packages/master/mingw-w64-apr/apr_wtypes.patch && patch -p0 -i apr_wtypes.patch endif -$(MV) apr-util-${APR_UTIL_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24$(PS)srclib$(PS)apr-util -$(CD) extlib/$(OS_ARCH)_$(OS_MARCH)/apache24 && sh configure --with-included-apr $(CE) From 49dfa1d416a055aed2ade67cf79d564c2a791827 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Mon, 20 Aug 2018 22:44:50 +0300 Subject: [PATCH 206/212] i --- Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index b27fd76d8..b24f4326a 100644 --- a/Makefile +++ b/Makefile @@ -236,10 +236,11 @@ apache-src: apr -$(MV) httpd-${HTTPD24_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24 -$(MKDIR) extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24$(PS)srclib -$(MV) apr-${APR_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24$(PS)srclib$(PS)apr -ifneq ("$(PROGRAMFILES)$(ProgramFiles)","") - -$(CD) extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24$(PS)srclib$(PS)apr && $(CURL) -O https://raw.githubusercontent.com/Alexpux/MINGW-packages/master/mingw-w64-apr/apr_ssize_t.patch && patch -p0 -i apr_ssize_t.patch - -$(CD) extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24$(PS)srclib$(PS)apr && $(CURL) -O https://raw.githubusercontent.com/Alexpux/MINGW-packages/master/mingw-w64-apr/apr_wtypes.patch && patch -p0 -i apr_wtypes.patch -endif +#ifneq ("$(PROGRAMFILES)$(ProgramFiles)","") +# -$(CD) extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24$(PS)srclib$(PS)apr && $(CURL) -O https://raw.githubusercontent.com/Alexpux/MINGW-packages/master/mingw-w64-apr/apr_ssize_t.patch && patch -p0 -i apr_ssize_t.patch +# -$(CD) extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24$(PS)srclib$(PS)apr && $(CURL) -O https://raw.githubusercontent.com/Alexpux/MINGW-packages/master/mingw-w64-apr/apr_wtypes.patch && patch -p0 -i apr_wtypes.patch +#endif + -$(CD) extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24 && patch -p0 -i ..$(PS)..$(PS)..$(PS)apr.patch -$(MV) apr-util-${APR_UTIL_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24$(PS)srclib$(PS)apr-util -$(CD) extlib/$(OS_ARCH)_$(OS_MARCH)/apache24 && sh configure --with-included-apr $(CE) apache22-src: apr From 80152f67a44730d85b6ae764603aefc1e99392d8 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Mon, 20 Aug 2018 22:46:10 +0300 Subject: [PATCH 207/212] i --- apr.patch | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 apr.patch diff --git a/apr.patch b/apr.patch new file mode 100644 index 000000000..3c6873774 --- /dev/null +++ b/apr.patch @@ -0,0 +1,24 @@ +--- srclib/apr/configure 2018-08-20 22:32:03.891461161 +0300 ++++ srclib/apr/configure.new 2018-08-20 22:30:16.843020164 +0300 +@@ -24542,10 +24542,6 @@ + ssize_t_fmt="ld" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: %ld" >&5 + $as_echo "%ld" >&6; } +-elif test "$ac_cv_sizeof_ssize_t" = "$ac_cv_sizeof_long_long"; then +- ssize_t_fmt="lld" +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: %lld" >&5 +-$as_echo "%lld" >&6; } + else + as_fn_error $? "could not determine the proper format for apr_ssize_t" "$LINENO" 5 + fi +@@ -24609,10 +24605,6 @@ + size_t_fmt="ld" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: %ld" >&5 + $as_echo "%ld" >&6; } +-elif test "$ac_cv_sizeof_size_t" = "$ac_cv_sizeof_long_long"; then +- size_t_fmt="lld" +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: %lld" >&5 +-$as_echo "%lld" >&6; } + else + as_fn_error $? "could not determine the proper format for apr_size_t" "$LINENO" 5 + fi From 624a4ccdff320d668ddb4bceff358f57151bac8f Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Mon, 20 Aug 2018 22:50:18 +0300 Subject: [PATCH 208/212] i --- apr.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apr.patch b/apr.patch index 3c6873774..e31365919 100644 --- a/apr.patch +++ b/apr.patch @@ -1,5 +1,5 @@ --- srclib/apr/configure 2018-08-20 22:32:03.891461161 +0300 -+++ srclib/apr/configure.new 2018-08-20 22:30:16.843020164 +0300 ++++ srclib/apr/configure 2018-08-20 22:30:16.843020164 +0300 @@ -24542,10 +24542,6 @@ ssize_t_fmt="ld" { $as_echo "$as_me:${as_lineno-$LINENO}: result: %ld" >&5 From ca28f2df65a0fea96316b229dfc72e2a25da7a6b Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Mon, 20 Aug 2018 22:54:40 +0300 Subject: [PATCH 209/212] i --- apr.patch | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/apr.patch b/apr.patch index e31365919..3fae9f625 100644 --- a/apr.patch +++ b/apr.patch @@ -4,10 +4,10 @@ ssize_t_fmt="ld" { $as_echo "$as_me:${as_lineno-$LINENO}: result: %ld" >&5 $as_echo "%ld" >&6; } --elif test "$ac_cv_sizeof_ssize_t" = "$ac_cv_sizeof_long_long"; then -- ssize_t_fmt="lld" -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: %lld" >&5 --$as_echo "%lld" >&6; } ++elif test "$ac_cv_sizeof_ssize_t" = "$ac_cv_sizeof_long_long"; then ++ ssize_t_fmt="lld" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: %lld" >&5 ++$as_echo "%lld" >&6; } else as_fn_error $? "could not determine the proper format for apr_ssize_t" "$LINENO" 5 fi @@ -15,10 +15,10 @@ size_t_fmt="ld" { $as_echo "$as_me:${as_lineno-$LINENO}: result: %ld" >&5 $as_echo "%ld" >&6; } --elif test "$ac_cv_sizeof_size_t" = "$ac_cv_sizeof_long_long"; then -- size_t_fmt="lld" -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: %lld" >&5 --$as_echo "%lld" >&6; } ++elif test "$ac_cv_sizeof_size_t" = "$ac_cv_sizeof_long_long"; then ++ size_t_fmt="lld" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: %lld" >&5 ++$as_echo "%lld" >&6; } else as_fn_error $? "could not determine the proper format for apr_size_t" "$LINENO" 5 fi From 5f860eab16450031f65b3969b980e62352350c91 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Mon, 20 Aug 2018 23:55:05 +0300 Subject: [PATCH 210/212] i --- Makefile | 6 ++---- apr.patch | 8 ++++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index b24f4326a..b82b5cb71 100644 --- a/Makefile +++ b/Makefile @@ -236,11 +236,9 @@ apache-src: apr -$(MV) httpd-${HTTPD24_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24 -$(MKDIR) extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24$(PS)srclib -$(MV) apr-${APR_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24$(PS)srclib$(PS)apr -#ifneq ("$(PROGRAMFILES)$(ProgramFiles)","") -# -$(CD) extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24$(PS)srclib$(PS)apr && $(CURL) -O https://raw.githubusercontent.com/Alexpux/MINGW-packages/master/mingw-w64-apr/apr_ssize_t.patch && patch -p0 -i apr_ssize_t.patch -# -$(CD) extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24$(PS)srclib$(PS)apr && $(CURL) -O https://raw.githubusercontent.com/Alexpux/MINGW-packages/master/mingw-w64-apr/apr_wtypes.patch && patch -p0 -i apr_wtypes.patch -#endif +ifneq ("$(PROGRAMFILES)$(ProgramFiles)","") -$(CD) extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24 && patch -p0 -i ..$(PS)..$(PS)..$(PS)apr.patch +endif -$(MV) apr-util-${APR_UTIL_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24$(PS)srclib$(PS)apr-util -$(CD) extlib/$(OS_ARCH)_$(OS_MARCH)/apache24 && sh configure --with-included-apr $(CE) apache22-src: apr diff --git a/apr.patch b/apr.patch index 3fae9f625..3fa095bee 100644 --- a/apr.patch +++ b/apr.patch @@ -1,6 +1,6 @@ ---- srclib/apr/configure 2018-08-20 22:32:03.891461161 +0300 -+++ srclib/apr/configure 2018-08-20 22:30:16.843020164 +0300 -@@ -24542,10 +24542,6 @@ +--- srclib/apr/configure 2017-10-18 17:50:19.000000000 +0300 ++++ srclib/apr/configure 2018-08-20 23:36:43.195893125 +0300 +@@ -24542,6 +24542,10 @@ ssize_t_fmt="ld" { $as_echo "$as_me:${as_lineno-$LINENO}: result: %ld" >&5 $as_echo "%ld" >&6; } @@ -11,7 +11,7 @@ else as_fn_error $? "could not determine the proper format for apr_ssize_t" "$LINENO" 5 fi -@@ -24609,10 +24605,6 @@ +@@ -24605,6 +24609,10 @@ size_t_fmt="ld" { $as_echo "$as_me:${as_lineno-$LINENO}: result: %ld" >&5 $as_echo "%ld" >&6; } From 0f4dea877d990b2f2b7db3d6669fd41edb1a36e5 Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 21 Aug 2018 00:11:27 +0300 Subject: [PATCH 211/212] i --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index b82b5cb71..4a9c5897f 100644 --- a/Makefile +++ b/Makefile @@ -237,6 +237,8 @@ apache-src: apr -$(MKDIR) extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24$(PS)srclib -$(MV) apr-${APR_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24$(PS)srclib$(PS)apr ifneq ("$(PROGRAMFILES)$(ProgramFiles)","") + -$(CD) extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24$(PS)srclib$(PS)apr && $(CURL) -O https://raw.githubusercontent.com/Alexpux/MINGW-packages/master/mingw-w64-apr/apr_ssize_t.patch && patch -p0 -i apr_ssize_t.patch + -$(CD) extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24$(PS)srclib$(PS)apr && $(CURL) -O https://raw.githubusercontent.com/Alexpux/MINGW-packages/master/mingw-w64-apr/apr_wtypes.patch && patch -p0 -i apr_wtypes.patch -$(CD) extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24 && patch -p0 -i ..$(PS)..$(PS)..$(PS)apr.patch endif -$(MV) apr-util-${APR_UTIL_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24$(PS)srclib$(PS)apr-util From 03dd3579eeacd20ff28adb5744393a4536a4b6de Mon Sep 17 00:00:00 2001 From: "Valera V.Kharseko" Date: Tue, 21 Aug 2018 00:15:50 +0300 Subject: [PATCH 212/212] i --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 4a9c5897f..46e421fa0 100644 --- a/Makefile +++ b/Makefile @@ -238,7 +238,7 @@ apache-src: apr -$(MV) apr-${APR_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24$(PS)srclib$(PS)apr ifneq ("$(PROGRAMFILES)$(ProgramFiles)","") -$(CD) extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24$(PS)srclib$(PS)apr && $(CURL) -O https://raw.githubusercontent.com/Alexpux/MINGW-packages/master/mingw-w64-apr/apr_ssize_t.patch && patch -p0 -i apr_ssize_t.patch - -$(CD) extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24$(PS)srclib$(PS)apr && $(CURL) -O https://raw.githubusercontent.com/Alexpux/MINGW-packages/master/mingw-w64-apr/apr_wtypes.patch && patch -p0 -i apr_wtypes.patch + -$(CD) extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24$(PS)srclib$(PS)apr && $(CURL) -O https://raw.githubusercontent.com/Alexpux/MINGW-packages/master/mingw-w64-apr/apr_wtypes.patch && patch -p0 -i apr_wtypes.patch -$(CD) extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24 && patch -p0 -i ..$(PS)..$(PS)..$(PS)apr.patch endif -$(MV) apr-util-${APR_UTIL_VERSION} extlib$(PS)$(OS_ARCH)_$(OS_MARCH)$(PS)apache24$(PS)srclib$(PS)apr-util