(windows) Disabled iconv support by default (#834)

lsh123 · Aug 7, 2024 · 5e6f3ac · 5e6f3ac
1 parent 1b01b9a
commit 5e6f3ac
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 107 deletions.
diff --git a/.github/workflows/make-check.yml b/.github/workflows/make-check.yml
@@ -243,7 +243,7 @@ jobs:
       shell: cmd
       run: |
           call "${{ env.VISUAL_STUDIO_ROOT }}\VC\Auxiliary\Build\vcvars64.bat"
-          cscript configure.js pedantic=yes werror=yes static=yes iconv=no ^
+          cscript configure.js pedantic=yes werror=yes static=yes ^
               crypto=${{ matrix.crypto }} ${{ matrix.config_flags }} ^
               prefix=${{ env.INSTALL_FOLDER }}\xmlsec.build ^
               include=${{ env.INSTALL_FOLDER }}\libxml2\include;${{ env.INSTALL_FOLDER }}\libxml2\include\libxml2;${{ env.INSTALL_FOLDER }}\libxslt\include;${{ env.INSTALL_FOLDER }}\openssl\include;%MSSDK_INCLUDE% ^

diff --git a/docs/index.html b/docs/index.html
@@ -70,7 +70,7 @@ <h1>XML Security Library</h1>
     <li>TBD<br>
 		The <a href="download.html">XML Security Library 1.3.6</a> release includes the following changes:
         <ul>
-            <li>TBD</li>
+            <li>(windows) Disabled iconv support by default (use 'iconv=yes' option for 'configure.js' to re-enable it).</li>
             <li>Several other small fixes (see <a href="https://github.com/lsh123/xmlsec/commits/master">more details</a>).</li>
         </ul>
 	</li>

diff --git a/win32/README.md b/win32/README.md
@@ -145,13 +145,6 @@ nmake
 nmake install
 ```
 
-In CygWin shell:
-
-```
-cd /cygdrive/c/local/distro/libxml2
-7z a ../libxml2-<version>-noiconv-win-x64.7z bin/ include/ lib/
-```
-
 ### LibXSLT
 
 In MSVC x64 native tools shell:
@@ -163,47 +156,15 @@ nmake
 nmake install
 ```
 
-In Cygwin shell:
-
-```
-cd /cygdrive/c/local/distro/libxslt
-7z a ../libxslt-<version>-noiconv-win-x64.7z bin/ include/ lib/
-```
-
-## OpenSSL 1.1
-
-In MSVC x64 native tools shell:
-
-```
-cd c:\<openssl-1.1-src-dir>
-C:\Strawberry\perl\bin\perl.exe Configure no-asm --prefix=c:\local\distro\openssl-1.1 VC-WIN64A
-nmake
-nmake install
-```
-
-In Cygwin shell:
-
-```
-cd /cygdrive/c/local/distro/openssl-1.1
-7z a ../openssl-<version>-x64.7z bin/ html/ include/ lib/
-```
-
 ## OpenSSL 3.x
 
 In MSVC x64 native tools shell:
 
 ```
-cd c:\<openssl-3.x-src-dir>
-C:\Strawberry\perl\bin\perl.exe Configure no-asm --prefix=c:\local\distro\openssl --release VC-WIN64A
+cd c:\<openssl-src-dir>
+C:\Strawberry\perl\bin\perl.exe Configure --prefix=c:\local\distro\openssl --release VC-WIN64A
 nmake
-nmake install
-```
-
-In Cygwin shell:
-
-```
-cd /cygdrive/c/local/distro/openssl
-7z a ../openssl-<version>-x64.7z bin/ html/ include/ lib/
+nmake install_sw
 ```
 
 ## XMLSec
@@ -212,26 +173,11 @@ In MSVC x64 native tools shell:
 
 ```
 cd c:\<xmlsec-src-dir>
-cscript configure.js pedantic=yes with-dl=yes iconv=no cruntime=/MD xslt=yes crypto=openssl unicode=yes prefix=C:\local\distro\xmlsec include=C:\local\distro\libxml2\include;C:\local\distro\libxml2\include\libxml2;C:\local\distro\libxslt\include;C:\local\distro\openssl\include; lib=C:\local\distro\libxml2\lib;C:\local\distro\libxslt\lib;C:\local\distro\openssl\lib
+cscript configure.js crypto=openssl,mscng xslt=yes unicode=yes with-dl=yes pedantic=yes werror=yes cruntime=/MD prefix=C:\local\distro\xmlsec include=C:\local\distro\libxml2\include;C:\local\distro\libxml2\include\libxml2;C:\local\distro\libxslt\include;C:\local\distro\openssl\include; lib=C:\local\distro\libxml2\lib;C:\local\distro\libxslt\lib;C:\local\distro\openssl\lib
 nmake
 nmake install
 ```
 
-In Cygwin shell:
-
-```
-cd /cygdrive/c/local/distro/openssl
-7z a ../openssl-<version>-x64.7z bin/ html/ include/ lib/
-```
-
-## Archive
-In Cygwin shell:
-```
-cd C:\local\distro
-zip -r xmlsec1-<version>-win64.zip libxml2 libxslt openssl xmlsec README.md
-```
-
-
 ## Authors
 - March 2002, Igor Zlatkovic <[email protected]>
 - July, 2022, Aleksey Sanin <[email protected]>
diff --git a/win32/building-dependencies.txt b/win32/building-dependencies.txt
diff --git a/win32/configure.js b/win32/configure.js
@@ -49,9 +49,9 @@ var withNss = 0;
 var withMSCrypto = 0;
 var withMSCng = 0;
 var withLibXSLT = 1;
-var withIconv = 1;
-var withFTP = 0; /* disable ftp by default */
-var withHTTP = 0; /* disable http by default */
+var withIconv = 0;     /* disable iconv by default */
+var withFTP = 0;       /* disable ftp by default */
+var withHTTP = 0;      /* disable http by default */
 var withGost = 0;
 var withRsaPkcs15 = 1;
 var withLegacyCrypto = 0;

diff --git a/win32/mycfg.bat b/win32/mycfg.bat
@@ -18,7 +18,7 @@ SET XMLSEC_PREFIX=%PREFIX%\xmlsec
 
 SET XMLSEC_INCLUDE=%LIBXML2_PREFIX%\include;%LIBXML2_PREFIX%\include\libxml2;%LIBXSLT_PREFIX%\include;%OPENSSL_PREFIX%\include;%MSSDK_INCLUDE%
 SET XMLSEC_LIB=%LIBXML2_PREFIX%\lib;%LIBXSLT_PREFIX%\lib;%OPENSSL_PREFIX%\lib;%MSSDK_LIB%
-SET XMLSEC_OPTIONS=debug=yes pedantic=yes werror=yes  with-dl=yes iconv=no cruntime=/MD xslt=yes crypto=%XMLSEC_CRYPTO% unicode=yes legacy-crypto=yes http=no
+SET XMLSEC_OPTIONS=debug=yes pedantic=yes werror=yes  with-dl=yes cruntime=/MD xslt=yes crypto=%XMLSEC_CRYPTO% unicode=yes legacy-crypto=yes http=no
 
 nmake clean
 del /F Makefile configure.txt