openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From truck...@apache.org
Subject svn commit: r1839837 - in /openoffice/trunk/main: curl/curl-7.50.1_win.patch curl/makefile.mk curl/prj/d.lst external_deps.lst
Date Sat, 01 Sep 2018 19:37:14 GMT
Author: truckman
Date: Sat Sep  1 19:37:14 2018
New Revision: 1839837

URL: http://svn.apache.org/viewvc?rev=1839837&view=rev
Log:
Upgrade the bundled version of curl from 7.50.1 to 7.61.0.


Removed:
    openoffice/trunk/main/curl/curl-7.50.1_win.patch
Modified:
    openoffice/trunk/main/curl/makefile.mk
    openoffice/trunk/main/curl/prj/d.lst
    openoffice/trunk/main/external_deps.lst

Modified: openoffice/trunk/main/curl/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/curl/makefile.mk?rev=1839837&r1=1839836&r2=1839837&view=diff
==============================================================================
--- openoffice/trunk/main/curl/makefile.mk (original)
+++ openoffice/trunk/main/curl/makefile.mk Sat Sep  1 19:37:14 2018
@@ -37,21 +37,10 @@ all:
 
 # --- Files --------------------------------------------------------
 
-TARFILE_NAME=curl-7.50.1
-TARFILE_MD5=c264788f2e4313a05140d712c1ec90c2
+TARFILE_NAME=curl-7.61.0
+TARFILE_MD5=ef343f64daab4691f528697b58a2d984
 PATCH_FILES=
 
-.IF "$(GUI)"=="WNT"
-	PATCH_FILES+=curl-7.50.1_win.patch
-#	.IF "$(COM)"=="GCC"
-#		PATCH_FILES+=curl-7.19.7_mingw.patch
-#	.ENDIF
-.ENDIF
-
-
-#CONVERTFILES= \
-    lib$/Makefile.vc6
-
 #ADDITIONAL_FILES= lib$/config-os2.h lib$/Makefile.os2
 
 .IF "$(GUI)"=="UNX"
@@ -113,15 +102,15 @@ curl_MACHINE:="X86"
 curl_MACHINE:="X64"
 .ENDIF
 
-BUILD_DIR=.$/lib
+BUILD_DIR=.$/winbuild
 .IF "$(debug)"==""
-BUILD_ACTION=nmake -f Makefile.vc9 cfg=release-dll EXCFLAGS=$(EXCFLAGS) MACHINE=$(curl_MACHINE)
+BUILD_ACTION=CC="cl.exe" nmake -f Makefile.vc mode=dll VC=9 EXCFLAGS=$(EXCFLAGS) MACHINE=$(curl_MACHINE)
 .ELSE
-BUILD_ACTION=nmake -f Makefile.vc9 cfg=debug-dll EXCFLAGS=$(EXCFLAGS) MACHINE=$(curl_MACHINE)
+BUILD_ACTION=CC="cl.exe" nmake -f Makefile.vc mode=dll VC=9 DEBUG=yes EXCFLAGS=$(EXCFLAGS)
MACHINE=$(curl_MACHINE)
 .ENDIF
 
-OUT2BIN=$(BUILD_DIR)$/libcurl.dll
-OUT2LIB=$(BUILD_DIR)$/libcurl.lib
+OUT2BIN=$(BUILD_DIR)$/../builds/libcurl-vc9-X86-release-dll-ipv6-sspi-winssl-obj-lib/libcurl.dll
+OUT2LIB=$(BUILD_DIR)$/../builds/libcurl-vc9-X86-release-dll-ipv6-sspi-winssl-obj-lib/libcurl.lib
 
 .ENDIF
 .ENDIF			# "$(GUI)"=="WNT"
@@ -150,8 +139,8 @@ OUT2INC= \
 	include$/curl$/typecheck-gcc.h  	\
 	include$/curl$/stdcheaders.h  	\
 	include$/curl$/mprintf.h	    \
-	include$/curl$/curlbuild.h		\
-	include$/curl$/curlrules.h
+	include$/curl$/system.h
+
 
 # --- Targets ------------------------------------------------------
 

Modified: openoffice/trunk/main/curl/prj/d.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/curl/prj/d.lst?rev=1839837&r1=1839836&r2=1839837&view=diff
==============================================================================
--- openoffice/trunk/main/curl/prj/d.lst (original)
+++ openoffice/trunk/main/curl/prj/d.lst Sat Sep  1 19:37:14 2018
@@ -6,8 +6,7 @@ mkdir: %_DEST%\inc%_EXT%\external\curl
 ..\%__SRC%\inc\multi.h %_DEST%\inc%_EXT%\external\curl\multi.h
 ..\%__SRC%\inc\stdcheaders.h %_DEST%\inc%_EXT%\external\curl\stdcheaders.h
 ..\%__SRC%\inc\typecheck-gcc.h %_DEST%\inc%_EXT%\external\curl\typecheck-gcc.h
-..\%__SRC%\inc\curlbuild.h %_DEST%\inc%_EXT%\external\curl\curlbuild.h
-..\%__SRC%\inc\curlrules.h %_DEST%\inc%_EXT%\external\curl\curlrules.h
+..\%__SRC%\inc\system.h %_DEST%\inc%_EXT%\external\curl\system.h
 
 ..\%__SRC%\bin\libcurl*.dll %_DEST%\bin%_EXT%\*.dll
 ..\%__SRC%\lib\libcurl.* %_DEST%\lib%_EXT%\libcurl.*

Modified: openoffice/trunk/main/external_deps.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/external_deps.lst?rev=1839837&r1=1839836&r2=1839837&view=diff
==============================================================================
--- openoffice/trunk/main/external_deps.lst (original)
+++ openoffice/trunk/main/external_deps.lst Sat Sep  1 19:37:14 2018
@@ -224,8 +224,8 @@ if (SYSTEM_EXPAT != YES)
     URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (SYSTEM_CURL != YES)
-    MD5 = c264788f2e4313a05140d712c1ec90c2
-    name = curl-7.50.1.tar.gz
+    MD5 = ef343f64daab4691f528697b58a2d984
+    name = curl-7.61.0.tar.gz
     URL1 = https://curl.haxx.se/download/$(name)
     URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 



Mime
View raw message