From 5e7a56340759d3b7f7b66ffc1a4bbbd4b96a667c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milo=C5=A1=20Komar=C4=8Devi=C4=87?= Date: Wed, 9 Dec 2020 09:28:49 +0100 Subject: [PATCH 01/43] Pretty print PlanarConfig --- src/tags_int.cpp | 8 +++++++- test/data/tiff-test.out | 4 ++-- tests/bugfixes/redmine/test_issue_831.py | 2 +- tests/tiff_test/test_tag_compare.py | 4 ++-- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/tags_int.cpp b/src/tags_int.cpp index e9b95a39..5133ddc3 100644 --- a/src/tags_int.cpp +++ b/src/tags_int.cpp @@ -190,6 +190,12 @@ namespace Exiv2 { { 8, N_("left, bottom") } // To silence compiler warning }; + //! PlanarConfiguration, tag 0x011c + extern const TagDetails exifPlanarConfiguration[] = { + { 1, N_("Chunky") }, + { 2, N_("Planar") } + }; + //! Predictor, tag 0x013d extern const TagDetails exifPredictor[] = { { 1, N_("No prediction scheme used") }, @@ -585,7 +591,7 @@ namespace Exiv2 { "or planar format. In JPEG compressed files a JPEG marker " "is used instead of this tag. If this field does not exist, " "the TIFF default of 1 (chunky) is assumed."), - ifd0Id, imgStruct, unsignedShort, 1, printValue), + ifd0Id, imgStruct, unsignedShort, 1, EXV_PRINT_TAG(exifPlanarConfiguration)), TagInfo(0x0122, "GrayResponseUnit", N_("Gray Response Unit"), N_("The precision of the information contained in the GrayResponseCurve."), ifd0Id, imgStruct, unsignedShort, 1, printValue), // TIFF tag diff --git a/test/data/tiff-test.out b/test/data/tiff-test.out index a59f8f39..01ac5b46 100644 --- a/test/data/tiff-test.out +++ b/test/data/tiff-test.out @@ -14,7 +14,7 @@ RowsPerStrip Short 1 "64" StripByteCounts Long 1 "243" XResolution Rational 1 "72" YResolution Rational 1 "72" -PlanarConfiguration Short 1 "1" +PlanarConfiguration Short 1 "Chunky" ResolutionUnit Short 1 "inch" exiv2 -pS output @@ -99,7 +99,7 @@ RowsPerStrip Short 1 "64" StripByteCounts Long 1 "243" XResolution Rational 1 "72" YResolution Rational 1 "72" -PlanarConfiguration Short 1 "1" +PlanarConfiguration Short 1 "Chunky" ResolutionUnit Short 1 "inch" ExifTag Long 1 "294" DateTimeOriginal Ascii 18 "Yesterday at noon" diff --git a/tests/bugfixes/redmine/test_issue_831.py b/tests/bugfixes/redmine/test_issue_831.py index 3369869b..7f044150 100644 --- a/tests/bugfixes/redmine/test_issue_831.py +++ b/tests/bugfixes/redmine/test_issue_831.py @@ -35,7 +35,7 @@ Exif.Image.RowsPerStrip Short 1 64 Exif.Image.StripByteCounts Long 1 243 Exif.Image.XResolution Rational 1 72 Exif.Image.YResolution Rational 1 72 -Exif.Image.PlanarConfiguration Short 1 1 +Exif.Image.PlanarConfiguration Short 1 Chunky Exif.Image.ResolutionUnit Short 1 inch """ ] diff --git a/tests/tiff_test/test_tag_compare.py b/tests/tiff_test/test_tag_compare.py index b50dd196..a8538bd2 100644 --- a/tests/tiff_test/test_tag_compare.py +++ b/tests/tiff_test/test_tag_compare.py @@ -92,7 +92,7 @@ class OutputTagExtract(metaclass=system_tests.CaseMeta): if pa_elem["tag"] in [ "ImageWidth", "ImageLength", "BitsPerSample", "DocumentName", "ImageDescription", "StripOffsets", - "SamplesPerPixel", "StripByteCounts", "PlanarConfiguration"]: + "SamplesPerPixel", "StripByteCounts"]: self.assertEquals(pa_elem["val"], pS_elem["val"]) def compare_stdout(self, i, command, got_stdout, expected_stdout): @@ -128,7 +128,7 @@ Exif.Image.RowsPerStrip Short 1 64 Exif.Image.StripByteCounts Long 1 243 Exif.Image.XResolution Rational 1 72 Exif.Image.YResolution Rational 1 72 -Exif.Image.PlanarConfiguration Short 1 1 +Exif.Image.PlanarConfiguration Short 1 Chunky Exif.Image.ResolutionUnit Short 1 inch """, """STRUCTURE OF TIFF FILE (II): $data_path/mini9.tif From 55500cf1050cafe88fda4afed08840421c0b9aa6 Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Sat, 12 Dec 2020 12:35:29 +0000 Subject: [PATCH 02/43] appveyor_mingw_0.27 --- mingw.yml | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 mingw.yml diff --git a/mingw.yml b/mingw.yml new file mode 100644 index 00000000..1ac1f035 --- /dev/null +++ b/mingw.yml @@ -0,0 +1,37 @@ +init: + - echo %PYTHON% + +environment: + PYTHON: "C:/Python37-x64" + + matrix: + - APPVEYOR_BUILD_WORKER_IMAGE: C:\mingw-w64\x86_64-7.2.0-posix-seh-rt_v5-rev1 + CMAKE_GENERATOR: Unix Makefiles + INTEGRATION_TESTS: 1 + ARCHITECTURE: x86_64 + UNIT_TESTS: 1 + WEBREADY: False + WARNINGS_AS_ERRORS: ON + +shallow_clone: true + +install: + - set PATH=%PATH%;%PYTHON%/Scripts/ + - echo %APPVEYOR_BUILD_FOLDER% + - python -m pip install --upgrade pip + - pip3.exe install lxml + - copy/y %PYTHON%\python.exe %PYTHON%\python3.exe + - for i in base-devel git coreutils dos2unix tar diffutils make \ + mingw-w64-x86_64-toolchain mingw-w64-x86_64-gcc mingw-w64-x86_64-gdb \ + mingw-w64-x86_64-cmake mingw-w64-x86_64-gettext mingw-w64-x86_64-python3 \ + mingw-w64-x86_64-libexpat mingw-w64-x86_64-libiconv mingw-w64-x86_64-zlib \ + mingw-w64-x86_64-gtest ; do (echo y | pacman -S $i) ; done + - cd %APPVEYOR_BUILD_FOLDER% + + +build_script: + - cmd: mkdir -p build + - cmd: cd build + - cmd: cmake .. -G "%CMAKE_GENERATOR%" -DEXIV2_TEAM_WARNINGS_AS_ERRORS=%WARNINGS_AS_ERRORS% -DCMAKE_BUILD_TYPE=Release -DEXIV2_ENABLE_NLS=OFF -DEXIV2_ENABLE_PNG=ON -DEXIV2_ENABLE_WEBREADY=%WEBREADY% -DEXIV2_BUILD_UNIT_TESTS=%UNIT_TESTS% + - cmd: cmake --build . --config Release + - cmd: cmake --build . --config Release --target tests From 5d1195921607dcf6f1023e216e1f931afe553b1d Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Sat, 12 Dec 2020 12:42:16 +0000 Subject: [PATCH 03/43] Changed APPVEYOR_BUILD_WORKER_IMAGE --- mingw.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/mingw.yml b/mingw.yml index 1ac1f035..19b9bd95 100644 --- a/mingw.yml +++ b/mingw.yml @@ -5,7 +5,7 @@ environment: PYTHON: "C:/Python37-x64" matrix: - - APPVEYOR_BUILD_WORKER_IMAGE: C:\mingw-w64\x86_64-7.2.0-posix-seh-rt_v5-rev1 + - APPVEYOR_BUILD_WORKER_IMAGE: MSYS2 CMAKE_GENERATOR: Unix Makefiles INTEGRATION_TESTS: 1 ARCHITECTURE: x86_64 @@ -18,9 +18,8 @@ shallow_clone: true install: - set PATH=%PATH%;%PYTHON%/Scripts/ - echo %APPVEYOR_BUILD_FOLDER% - - python -m pip install --upgrade pip + - python3 -m pip install --upgrade pip - pip3.exe install lxml - - copy/y %PYTHON%\python.exe %PYTHON%\python3.exe - for i in base-devel git coreutils dos2unix tar diffutils make \ mingw-w64-x86_64-toolchain mingw-w64-x86_64-gcc mingw-w64-x86_64-gdb \ mingw-w64-x86_64-cmake mingw-w64-x86_64-gettext mingw-w64-x86_64-python3 \ From ede34c0ff5cb5f2b755ae2b80225a5e0794e6754 Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Sat, 12 Dec 2020 13:23:47 +0000 Subject: [PATCH 04/43] Try again. --- mingw.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/mingw.yml b/mingw.yml index 19b9bd95..be517ead 100644 --- a/mingw.yml +++ b/mingw.yml @@ -5,8 +5,7 @@ environment: PYTHON: "C:/Python37-x64" matrix: - - APPVEYOR_BUILD_WORKER_IMAGE: MSYS2 - CMAKE_GENERATOR: Unix Makefiles + - APPVEYOR_BUILD_WORKER_IMAGE: MinGW-w64 INTEGRATION_TESTS: 1 ARCHITECTURE: x86_64 UNIT_TESTS: 1 @@ -16,7 +15,6 @@ environment: shallow_clone: true install: - - set PATH=%PATH%;%PYTHON%/Scripts/ - echo %APPVEYOR_BUILD_FOLDER% - python3 -m pip install --upgrade pip - pip3.exe install lxml @@ -31,6 +29,6 @@ install: build_script: - cmd: mkdir -p build - cmd: cd build - - cmd: cmake .. -G "%CMAKE_GENERATOR%" -DEXIV2_TEAM_WARNINGS_AS_ERRORS=%WARNINGS_AS_ERRORS% -DCMAKE_BUILD_TYPE=Release -DEXIV2_ENABLE_NLS=OFF -DEXIV2_ENABLE_PNG=ON -DEXIV2_ENABLE_WEBREADY=%WEBREADY% -DEXIV2_BUILD_UNIT_TESTS=%UNIT_TESTS% + - cmd: cmake .. -G "Unix Makefiles" -DEXIV2_TEAM_WARNINGS_AS_ERRORS=%WARNINGS_AS_ERRORS% -DCMAKE_BUILD_TYPE=Release -DEXIV2_ENABLE_NLS=OFF -DEXIV2_ENABLE_PNG=ON -DEXIV2_ENABLE_WEBREADY=%WEBREADY% -DEXIV2_BUILD_UNIT_TESTS=%UNIT_TESTS% - cmd: cmake --build . --config Release - cmd: cmake --build . --config Release --target tests From 3fe67758dd3544756bd13e403939db3026a52aab Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Sat, 12 Dec 2020 14:00:29 +0000 Subject: [PATCH 05/43] One more time. --- mingw.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mingw.yml b/mingw.yml index be517ead..5765d472 100644 --- a/mingw.yml +++ b/mingw.yml @@ -5,7 +5,7 @@ environment: PYTHON: "C:/Python37-x64" matrix: - - APPVEYOR_BUILD_WORKER_IMAGE: MinGW-w64 + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 INTEGRATION_TESTS: 1 ARCHITECTURE: x86_64 UNIT_TESTS: 1 @@ -18,6 +18,7 @@ install: - echo %APPVEYOR_BUILD_FOLDER% - python3 -m pip install --upgrade pip - pip3.exe install lxml + - bash -c \ - for i in base-devel git coreutils dos2unix tar diffutils make \ mingw-w64-x86_64-toolchain mingw-w64-x86_64-gcc mingw-w64-x86_64-gdb \ mingw-w64-x86_64-cmake mingw-w64-x86_64-gettext mingw-w64-x86_64-python3 \ From b8ce6d125f4446465aa906578a6b0cc515d2a46f Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Sat, 12 Dec 2020 14:09:16 +0000 Subject: [PATCH 06/43] And another go. --- mingw.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/mingw.yml b/mingw.yml index 5765d472..6e82606f 100644 --- a/mingw.yml +++ b/mingw.yml @@ -16,10 +16,7 @@ shallow_clone: true install: - echo %APPVEYOR_BUILD_FOLDER% - - python3 -m pip install --upgrade pip - - pip3.exe install lxml - - bash -c \ - - for i in base-devel git coreutils dos2unix tar diffutils make \ + - c:\C:\msys64\usr\bin\bash -c "python -m pip install --upgrade pip;pip3.exe install lxml ; for i in base-devel git coreutils dos2unix tar diffutils make \ mingw-w64-x86_64-toolchain mingw-w64-x86_64-gcc mingw-w64-x86_64-gdb \ mingw-w64-x86_64-cmake mingw-w64-x86_64-gettext mingw-w64-x86_64-python3 \ mingw-w64-x86_64-libexpat mingw-w64-x86_64-libiconv mingw-w64-x86_64-zlib \ From 4ee866463b2b24d75ee61f085a74ac60c45d2893 Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Sat, 12 Dec 2020 14:11:04 +0000 Subject: [PATCH 07/43] Getting better. --- mingw.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mingw.yml b/mingw.yml index 6e82606f..87963d59 100644 --- a/mingw.yml +++ b/mingw.yml @@ -16,12 +16,13 @@ shallow_clone: true install: - echo %APPVEYOR_BUILD_FOLDER% - - c:\C:\msys64\usr\bin\bash -c "python -m pip install --upgrade pip;pip3.exe install lxml ; for i in base-devel git coreutils dos2unix tar diffutils make \ + - C:\msys64\usr\bin\bash -c "python -m pip install --upgrade pip;pip3.exe install lxml ; for i in base-devel git coreutils dos2unix tar diffutils make \ mingw-w64-x86_64-toolchain mingw-w64-x86_64-gcc mingw-w64-x86_64-gdb \ mingw-w64-x86_64-cmake mingw-w64-x86_64-gettext mingw-w64-x86_64-python3 \ mingw-w64-x86_64-libexpat mingw-w64-x86_64-libiconv mingw-w64-x86_64-zlib \ mingw-w64-x86_64-gtest ; do (echo y | pacman -S $i) ; done - cd %APPVEYOR_BUILD_FOLDER% + - C:\msys64\usr\bin\bash build_script: From 9477fa42cfcad618f03c241443c2cc657fb0ed24 Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Sat, 12 Dec 2020 14:15:54 +0000 Subject: [PATCH 08/43] Modify the path. --- mingw.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/mingw.yml b/mingw.yml index 87963d59..dfa343c5 100644 --- a/mingw.yml +++ b/mingw.yml @@ -16,6 +16,7 @@ shallow_clone: true install: - echo %APPVEYOR_BUILD_FOLDER% + - set "PATH=c:\msys64\mingw64\bin;c:\msys64\usr\bin;c:\msys64\usr\local\bin;" - C:\msys64\usr\bin\bash -c "python -m pip install --upgrade pip;pip3.exe install lxml ; for i in base-devel git coreutils dos2unix tar diffutils make \ mingw-w64-x86_64-toolchain mingw-w64-x86_64-gcc mingw-w64-x86_64-gdb \ mingw-w64-x86_64-cmake mingw-w64-x86_64-gettext mingw-w64-x86_64-python3 \ From fc950fcdfecced4d9ba76d2a462434d292f24be0 Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Sat, 12 Dec 2020 16:08:30 +0000 Subject: [PATCH 09/43] Might build this time. --- mingw.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/mingw.yml b/mingw.yml index dfa343c5..69f23031 100644 --- a/mingw.yml +++ b/mingw.yml @@ -23,12 +23,8 @@ install: mingw-w64-x86_64-libexpat mingw-w64-x86_64-libiconv mingw-w64-x86_64-zlib \ mingw-w64-x86_64-gtest ; do (echo y | pacman -S $i) ; done - cd %APPVEYOR_BUILD_FOLDER% - - C:\msys64\usr\bin\bash build_script: - - cmd: mkdir -p build - - cmd: cd build - - cmd: cmake .. -G "Unix Makefiles" -DEXIV2_TEAM_WARNINGS_AS_ERRORS=%WARNINGS_AS_ERRORS% -DCMAKE_BUILD_TYPE=Release -DEXIV2_ENABLE_NLS=OFF -DEXIV2_ENABLE_PNG=ON -DEXIV2_ENABLE_WEBREADY=%WEBREADY% -DEXIV2_BUILD_UNIT_TESTS=%UNIT_TESTS% - - cmd: cmake --build . --config Release - - cmd: cmake --build . --config Release --target tests + - cmd: C:\msys64\usr\bin\bash -c "pwd; mkdir -p build; cd build ; cmake .. -G "Unix Makefiles" ; make ; make tests;" + - cmd: echo cmake .. -G "Unix Makefiles" -DEXIV2_TEAM_WARNINGS_AS_ERRORS=%WARNINGS_AS_ERRORS% -DCMAKE_BUILD_TYPE=Release -DEXIV2_ENABLE_NLS=OFF -DEXIV2_ENABLE_PNG=ON -DEXIV2_ENABLE_WEBREADY=%WEBREADY% -DEXIV2_BUILD_UNIT_TESTS=%UNIT_TESTS% From 80ab1bb61404613415029cf347886293a73de66b Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Sat, 12 Dec 2020 16:19:47 +0000 Subject: [PATCH 10/43] Fix typo. --- mingw.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mingw.yml b/mingw.yml index 69f23031..2f4d93f5 100644 --- a/mingw.yml +++ b/mingw.yml @@ -26,5 +26,5 @@ install: build_script: - - cmd: C:\msys64\usr\bin\bash -c "pwd; mkdir -p build; cd build ; cmake .. -G "Unix Makefiles" ; make ; make tests;" + - cmd: C:\msys64\usr\bin\bash -c "pwd; mkdir -p build; cd build ; cmake .. -G 'Unix Makefiles' ; make ; make tests;" - cmd: echo cmake .. -G "Unix Makefiles" -DEXIV2_TEAM_WARNINGS_AS_ERRORS=%WARNINGS_AS_ERRORS% -DCMAKE_BUILD_TYPE=Release -DEXIV2_ENABLE_NLS=OFF -DEXIV2_ENABLE_PNG=ON -DEXIV2_ENABLE_WEBREADY=%WEBREADY% -DEXIV2_BUILD_UNIT_TESTS=%UNIT_TESTS% From 08d7f3ce081157eb8284c5a7c2f25d9889997bfd Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Sat, 12 Dec 2020 17:04:18 +0000 Subject: [PATCH 11/43] Run python_tests. --- mingw.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mingw.yml b/mingw.yml index 2f4d93f5..ff7c8e61 100644 --- a/mingw.yml +++ b/mingw.yml @@ -26,5 +26,4 @@ install: build_script: - - cmd: C:\msys64\usr\bin\bash -c "pwd; mkdir -p build; cd build ; cmake .. -G 'Unix Makefiles' ; make ; make tests;" - - cmd: echo cmake .. -G "Unix Makefiles" -DEXIV2_TEAM_WARNINGS_AS_ERRORS=%WARNINGS_AS_ERRORS% -DCMAKE_BUILD_TYPE=Release -DEXIV2_ENABLE_NLS=OFF -DEXIV2_ENABLE_PNG=ON -DEXIV2_ENABLE_WEBREADY=%WEBREADY% -DEXIV2_BUILD_UNIT_TESTS=%UNIT_TESTS% + - cmd: C:\msys64\usr\bin\bash -c "pwd; mkdir -p build; cd build ; cmake .. -G 'Unix Makefiles' -DCMAKE_CXX_STANDARD=11 -DCMAKE_CXX_FLAGS=-Wno-deprecated ; make ; make python_tests;" From fa2efc2a2300f711312aa2bab0393e1d2904ea57 Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Sat, 12 Dec 2020 18:08:18 +0000 Subject: [PATCH 12/43] Reformmated. --- mingw.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mingw.yml b/mingw.yml index ff7c8e61..577b879a 100644 --- a/mingw.yml +++ b/mingw.yml @@ -26,4 +26,9 @@ install: build_script: - - cmd: C:\msys64\usr\bin\bash -c "pwd; mkdir -p build; cd build ; cmake .. -G 'Unix Makefiles' -DCMAKE_CXX_STANDARD=11 -DCMAKE_CXX_FLAGS=-Wno-deprecated ; make ; make python_tests;" + - cmd: C:\msys64\usr\bin\bash -c " \ + mkdir -p build; \ + cd build ; \ + cmake .. -G 'Unix Makefiles' -DCMAKE_CXX_STANDARD=98 -DCMAKE_CXX_FLAGS=-Wno-deprecated ;\ + make ; \ + make python_tests;" From ff62f18b66492f3733e9a8e05c42ab25322c227e Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Sat, 12 Dec 2020 18:20:27 +0000 Subject: [PATCH 13/43] Try again! --- mingw.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/mingw.yml b/mingw.yml index 577b879a..0166493c 100644 --- a/mingw.yml +++ b/mingw.yml @@ -26,9 +26,8 @@ install: build_script: - - cmd: C:\msys64\usr\bin\bash -c " \ - mkdir -p build; \ - cd build ; \ - cmake .. -G 'Unix Makefiles' -DCMAKE_CXX_STANDARD=98 -DCMAKE_CXX_FLAGS=-Wno-deprecated ;\ - make ; \ - make python_tests;" + - cmd: set CMD="mkdir -p build ;%CMD%" + - cmd: set CMD="cd build ;%CMD%" + - cmd: set CMD="cmake .. -G 'Unix Makefiles' -DCMAKE_CXX_STANDARD=98 -DCMAKE_CXX_FLAGS=-Wno-deprecated ;%CMD%" + - cmd: set CMD="make python_tests ;%CMD%" + - cmd: C:\msys64\usr\bin\bash -c "%CMD%" From ffd88eca68ab1a2ec8c7279c5bdf06645f622bbe Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Sat, 12 Dec 2020 18:45:40 +0000 Subject: [PATCH 14/43] Debugging mingw.yml --- mingw.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/mingw.yml b/mingw.yml index 0166493c..b7f7176c 100644 --- a/mingw.yml +++ b/mingw.yml @@ -30,4 +30,5 @@ build_script: - cmd: set CMD="cd build ;%CMD%" - cmd: set CMD="cmake .. -G 'Unix Makefiles' -DCMAKE_CXX_STANDARD=98 -DCMAKE_CXX_FLAGS=-Wno-deprecated ;%CMD%" - cmd: set CMD="make python_tests ;%CMD%" + - cmd: echo %CMD% - cmd: C:\msys64\usr\bin\bash -c "%CMD%" From d06ce9c437ff186886bb04079d11af93195284aa Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Sat, 12 Dec 2020 18:56:27 +0000 Subject: [PATCH 15/43] Last change, I hope. --- mingw.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mingw.yml b/mingw.yml index b7f7176c..77a03f4a 100644 --- a/mingw.yml +++ b/mingw.yml @@ -26,9 +26,9 @@ install: build_script: - - cmd: set CMD="mkdir -p build ;%CMD%" - - cmd: set CMD="cd build ;%CMD%" - - cmd: set CMD="cmake .. -G 'Unix Makefiles' -DCMAKE_CXX_STANDARD=98 -DCMAKE_CXX_FLAGS=-Wno-deprecated ;%CMD%" - - cmd: set CMD="make python_tests ;%CMD%" + - cmd: set CMD="%CDM%; mkdir -p build" + - cmd: set CMD="%CMD%; cd build " + - cmd: set CMD="%CMD%; cmake .. -G 'Unix Makefiles' -DCMAKE_CXX_STANDARD=98 -DCMAKE_CXX_FLAGS=-Wno-deprecated" + - cmd: set CMD="%CMD%; make python_tests" - cmd: echo %CMD% - - cmd: C:\msys64\usr\bin\bash -c "%CMD%" + - cmd: C:\msys64\usr\bin\bash -c "%CMD%" From 686b7da1940e1c803ee8cd4fa966425089ed26ac Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Sat, 12 Dec 2020 19:10:22 +0000 Subject: [PATCH 16/43] And another try. --- mingw.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mingw.yml b/mingw.yml index 77a03f4a..8c63f3ea 100644 --- a/mingw.yml +++ b/mingw.yml @@ -26,9 +26,9 @@ install: build_script: - - cmd: set CMD="%CDM%; mkdir -p build" - - cmd: set CMD="%CMD%; cd build " - - cmd: set CMD="%CMD%; cmake .. -G 'Unix Makefiles' -DCMAKE_CXX_STANDARD=98 -DCMAKE_CXX_FLAGS=-Wno-deprecated" - - cmd: set CMD="%CMD%; make python_tests" + - cmd: set CMD=%CDM%; mkdir -p build + - cmd: set CMD=%CMD%; cd build + - cmd: set CMD=%CMD%; cmake .. -G 'Unix Makefiles' -DCMAKE_CXX_STANDARD=98 -DCMAKE_CXX_FLAGS=-Wno-deprecated + - cmd: set CMD=%CMD%; make python_tests - cmd: echo %CMD% - cmd: C:\msys64\usr\bin\bash -c "%CMD%" From a5b6a7477ea86e652e8206cc6bf31fcb7b8359bd Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Sat, 12 Dec 2020 19:55:36 +0000 Subject: [PATCH 17/43] And another. --- mingw.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mingw.yml b/mingw.yml index 8c63f3ea..05f7a929 100644 --- a/mingw.yml +++ b/mingw.yml @@ -26,7 +26,7 @@ install: build_script: - - cmd: set CMD=%CDM%; mkdir -p build + - cmd: set CMD=mkdir -p build - cmd: set CMD=%CMD%; cd build - cmd: set CMD=%CMD%; cmake .. -G 'Unix Makefiles' -DCMAKE_CXX_STANDARD=98 -DCMAKE_CXX_FLAGS=-Wno-deprecated - cmd: set CMD=%CMD%; make python_tests From 5ccf574ac6693bcffcb5dbba239bf31cde608a9d Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Sat, 12 Dec 2020 20:07:06 +0000 Subject: [PATCH 18/43] Debugging mingw.yml --- mingw.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/mingw.yml b/mingw.yml index 05f7a929..2a397560 100644 --- a/mingw.yml +++ b/mingw.yml @@ -26,6 +26,7 @@ install: build_script: + - cmd: set CMD=which python3 python - cmd: set CMD=mkdir -p build - cmd: set CMD=%CMD%; cd build - cmd: set CMD=%CMD%; cmake .. -G 'Unix Makefiles' -DCMAKE_CXX_STANDARD=98 -DCMAKE_CXX_FLAGS=-Wno-deprecated From 93daa057ea0c5ee4e687b34f063cf893cf17f92b Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Sat, 12 Dec 2020 20:58:10 +0000 Subject: [PATCH 19/43] Debugging mingw.yml --- mingw.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mingw.yml b/mingw.yml index 2a397560..ac34a4d2 100644 --- a/mingw.yml +++ b/mingw.yml @@ -26,10 +26,13 @@ install: build_script: - - cmd: set CMD=which python3 python - cmd: set CMD=mkdir -p build - cmd: set CMD=%CMD%; cd build - cmd: set CMD=%CMD%; cmake .. -G 'Unix Makefiles' -DCMAKE_CXX_STANDARD=98 -DCMAKE_CXX_FLAGS=-Wno-deprecated - - cmd: set CMD=%CMD%; make python_tests - cmd: echo %CMD% - cmd: C:\msys64\usr\bin\bash -c "%CMD%" + - cmd: set CMD=which python3 python + - cmd: set CMD=%CMD%; python --version + - cmd: set CMD=%CMD%; bin/exiv2 --verbose --version + - cmd: C:\msys64\usr\bin\bash -c "%CMD%" + - cmd: bin From 5d64acde05f8e5c9792c3d3b8851faafd3d7a17c Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Sat, 12 Dec 2020 21:10:48 +0000 Subject: [PATCH 20/43] More debugging. --- mingw.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw.yml b/mingw.yml index ac34a4d2..4c4bd8b9 100644 --- a/mingw.yml +++ b/mingw.yml @@ -30,9 +30,12 @@ build_script: - cmd: set CMD=%CMD%; cd build - cmd: set CMD=%CMD%; cmake .. -G 'Unix Makefiles' -DCMAKE_CXX_STANDARD=98 -DCMAKE_CXX_FLAGS=-Wno-deprecated - cmd: echo %CMD% + - cd %APPVEYOR_BUILD_FOLDER% - cmd: C:\msys64\usr\bin\bash -c "%CMD%" - cmd: set CMD=which python3 python - cmd: set CMD=%CMD%; python --version - - cmd: set CMD=%CMD%; bin/exiv2 --verbose --version + - cmd: set CMD=%CMD%; build/bin/exiv2 --verbose --version; pwd ; ls -l + - cmd: echo %CMD% + - cd %APPVEYOR_BUILD_FOLDER% - cmd: C:\msys64\usr\bin\bash -c "%CMD%" - cmd: bin From 08037f63b3d827ed54def1ff00075e0903dc6631 Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Sat, 12 Dec 2020 21:31:17 +0000 Subject: [PATCH 21/43] Debugging --- mingw.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/mingw.yml b/mingw.yml index 4c4bd8b9..021d8012 100644 --- a/mingw.yml +++ b/mingw.yml @@ -29,6 +29,7 @@ build_script: - cmd: set CMD=mkdir -p build - cmd: set CMD=%CMD%; cd build - cmd: set CMD=%CMD%; cmake .. -G 'Unix Makefiles' -DCMAKE_CXX_STANDARD=98 -DCMAKE_CXX_FLAGS=-Wno-deprecated + - cmd: set CMD=%CMD%; cmake --build . --config Release - cmd: echo %CMD% - cd %APPVEYOR_BUILD_FOLDER% - cmd: C:\msys64\usr\bin\bash -c "%CMD%" From e4274e3bc4e287a7f6a9b5f11e07524e56df288c Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Sat, 12 Dec 2020 21:43:34 +0000 Subject: [PATCH 22/43] More debugging. --- mingw.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mingw.yml b/mingw.yml index 021d8012..27da38e0 100644 --- a/mingw.yml +++ b/mingw.yml @@ -36,7 +36,7 @@ build_script: - cmd: set CMD=which python3 python - cmd: set CMD=%CMD%; python --version - cmd: set CMD=%CMD%; build/bin/exiv2 --verbose --version; pwd ; ls -l + - cmd: set CMD=%CMD%; cd build ; cmake --build . --config Release --target tests - cmd: echo %CMD% - cd %APPVEYOR_BUILD_FOLDER% - cmd: C:\msys64\usr\bin\bash -c "%CMD%" - - cmd: bin From c44d051b329bfa804b21225d4cbfae65b1eb768d Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Sat, 12 Dec 2020 22:07:14 +0000 Subject: [PATCH 23/43] Only run python_tests --- mingw.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mingw.yml b/mingw.yml index 27da38e0..897d0257 100644 --- a/mingw.yml +++ b/mingw.yml @@ -36,7 +36,7 @@ build_script: - cmd: set CMD=which python3 python - cmd: set CMD=%CMD%; python --version - cmd: set CMD=%CMD%; build/bin/exiv2 --verbose --version; pwd ; ls -l - - cmd: set CMD=%CMD%; cd build ; cmake --build . --config Release --target tests + - cmd: set CMD=%CMD%; cd build ; cmake --build . --config Release --target python_tests - cmd: echo %CMD% - cd %APPVEYOR_BUILD_FOLDER% - cmd: C:\msys64\usr\bin\bash -c "%CMD%" From 5375b30c309e605e9bb543a21ec37d741394d94d Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Sun, 13 Dec 2020 00:03:23 +0000 Subject: [PATCH 24/43] Try to build using Cygwin/64 --- mingw.yml | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/mingw.yml b/mingw.yml index 897d0257..1dc6d70d 100644 --- a/mingw.yml +++ b/mingw.yml @@ -17,26 +17,36 @@ shallow_clone: true install: - echo %APPVEYOR_BUILD_FOLDER% - set "PATH=c:\msys64\mingw64\bin;c:\msys64\usr\bin;c:\msys64\usr\local\bin;" - - C:\msys64\usr\bin\bash -c "python -m pip install --upgrade pip;pip3.exe install lxml ; for i in base-devel git coreutils dos2unix tar diffutils make \ + - echo C:\msys64\usr\bin\bash -c "python -m pip install --upgrade pip;pip3.exe install lxml ; for i in base-devel git coreutils dos2unix tar diffutils make \ mingw-w64-x86_64-toolchain mingw-w64-x86_64-gcc mingw-w64-x86_64-gdb \ mingw-w64-x86_64-cmake mingw-w64-x86_64-gettext mingw-w64-x86_64-python3 \ mingw-w64-x86_64-libexpat mingw-w64-x86_64-libiconv mingw-w64-x86_64-zlib \ mingw-w64-x86_64-gtest ; do (echo y | pacman -S $i) ; done - cd %APPVEYOR_BUILD_FOLDER% - + - set "PATH=c:\cygwin64\usr\local\bin;c:\cygwin64\bin;c:\cygwin64\usr\bin;c:\cygwin64\usr\sbin;" + - C:\cygwin64\bin\bash -c "python -m pip install --upgrade pip;pip3.exe install lxml" build_script: - - cmd: set CMD=mkdir -p build - - cmd: set CMD=%CMD%; cd build - - cmd: set CMD=%CMD%; cmake .. -G 'Unix Makefiles' -DCMAKE_CXX_STANDARD=98 -DCMAKE_CXX_FLAGS=-Wno-deprecated - - cmd: set CMD=%CMD%; cmake --build . --config Release - - cmd: echo %CMD% + - cmd: rem set CMD=mkdir -p build + - cmd: rem set CMD=%CMD%; cd build + - cmd: rem set CMD=%CMD%; cmake .. -G 'Unix Makefiles' -DCMAKE_CXX_STANDARD=98 -DCMAKE_CXX_FLAGS=-Wno-deprecated + - cmd: rem set CMD=%CMD%; cmake --build . --config Release + - cmd: rem echo %CMD% + - cd %APPVEYOR_BUILD_FOLDER% + - cmd: rem C:\msys64\usr\bin\bash -c "%CMD%" + - cmd: rem set CMD=which python3 python + - cmd: rem set CMD=%CMD%; python --version + - cmd: rem set CMD=%CMD%; build/bin/exiv2 --verbose --version; pwd ; ls -l + - cmd: rem set CMD=%CMD%; cd build ; cmake --build . --config Release --target python_tests + - cmd: rem echo %CMD% - cd %APPVEYOR_BUILD_FOLDER% - cmd: C:\msys64\usr\bin\bash -c "%CMD%" - - cmd: set CMD=which python3 python - - cmd: set CMD=%CMD%; python --version - - cmd: set CMD=%CMD%; build/bin/exiv2 --verbose --version; pwd ; ls -l - - cmd: set CMD=%CMD%; cd build ; cmake --build . --config Release --target python_tests + - cmd: set "PATH=c:\cygwin64\usr\local\bin;c:\cygwin64\bin;c:\cygwin64\usr\bin;c:\cygwin64\usr\sbin;" + - cmd: set CMD=mkdir -p build + - cmd: set CMD=%CMD%; cd build + - cmd: set CMD=%CMD%;cmake .. + - cmd: set CMD=%CMD%; make - cmd: echo %CMD% - cd %APPVEYOR_BUILD_FOLDER% - - cmd: C:\msys64\usr\bin\bash -c "%CMD%" + - cmd: C:\cygwin64\bin\bash -c "%CMD%" + From c88f733cdf96b9f42f7eb845b5e07355d11f2143 Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Sun, 13 Dec 2020 00:06:46 +0000 Subject: [PATCH 25/43] Debugging cygwin/64 --- mingw.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mingw.yml b/mingw.yml index 1dc6d70d..9c123feb 100644 --- a/mingw.yml +++ b/mingw.yml @@ -24,7 +24,7 @@ install: mingw-w64-x86_64-gtest ; do (echo y | pacman -S $i) ; done - cd %APPVEYOR_BUILD_FOLDER% - set "PATH=c:\cygwin64\usr\local\bin;c:\cygwin64\bin;c:\cygwin64\usr\bin;c:\cygwin64\usr\sbin;" - - C:\cygwin64\bin\bash -c "python -m pip install --upgrade pip;pip3.exe install lxml" + - C:\cygwin64\bin\bash -c "ls -l /usr/bin" build_script: - cmd: rem set CMD=mkdir -p build From ebb6af6c34d9daaeee9d88671ee92e465e129bb8 Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Sun, 13 Dec 2020 00:11:19 +0000 Subject: [PATCH 26/43] Cygwin --- mingw.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mingw.yml b/mingw.yml index 9c123feb..ef4db496 100644 --- a/mingw.yml +++ b/mingw.yml @@ -24,7 +24,7 @@ install: mingw-w64-x86_64-gtest ; do (echo y | pacman -S $i) ; done - cd %APPVEYOR_BUILD_FOLDER% - set "PATH=c:\cygwin64\usr\local\bin;c:\cygwin64\bin;c:\cygwin64\usr\bin;c:\cygwin64\usr\sbin;" - - C:\cygwin64\bin\bash -c "ls -l /usr/bin" + - C:\cygwin64\bin\bash -c "wget https://raw.githubusercontent.com/transcode-open/apt-cyg/master/apt-cyg ; chmod +x apt-cyg; mv apt-cyg /usr/local/bin;apt-cyg install cmake" build_script: - cmd: rem set CMD=mkdir -p build From 0f069a60f51290492ccf95ba0a8ea096fdaabb5c Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Sun, 13 Dec 2020 00:15:44 +0000 Subject: [PATCH 27/43] Cygwin: Add zlib and expat to install --- mingw.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mingw.yml b/mingw.yml index ef4db496..e2e4d610 100644 --- a/mingw.yml +++ b/mingw.yml @@ -24,7 +24,8 @@ install: mingw-w64-x86_64-gtest ; do (echo y | pacman -S $i) ; done - cd %APPVEYOR_BUILD_FOLDER% - set "PATH=c:\cygwin64\usr\local\bin;c:\cygwin64\bin;c:\cygwin64\usr\bin;c:\cygwin64\usr\sbin;" - - C:\cygwin64\bin\bash -c "wget https://raw.githubusercontent.com/transcode-open/apt-cyg/master/apt-cyg ; chmod +x apt-cyg; mv apt-cyg /usr/local/bin;apt-cyg install cmake" + - C:\cygwin64\bin\bash -c "wget https://raw.githubusercontent.com/transcode-open/apt-cyg/master/apt-cyg ; chmod +x apt-cyg; mv apt-cyg /usr/local/bin" + - C:\cygwin64\bin\bash -c "apt-cyg install cmake zlib-dev expat-dev" build_script: - cmd: rem set CMD=mkdir -p build From f5c2002fbbb1537f7e6c5e43af3b756d54006311 Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Sun, 13 Dec 2020 00:22:53 +0000 Subject: [PATCH 28/43] Cygwin/64 install depedencies. --- mingw.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mingw.yml b/mingw.yml index e2e4d610..2e83efa7 100644 --- a/mingw.yml +++ b/mingw.yml @@ -25,7 +25,7 @@ install: - cd %APPVEYOR_BUILD_FOLDER% - set "PATH=c:\cygwin64\usr\local\bin;c:\cygwin64\bin;c:\cygwin64\usr\bin;c:\cygwin64\usr\sbin;" - C:\cygwin64\bin\bash -c "wget https://raw.githubusercontent.com/transcode-open/apt-cyg/master/apt-cyg ; chmod +x apt-cyg; mv apt-cyg /usr/local/bin" - - C:\cygwin64\bin\bash -c "apt-cyg install cmake zlib-dev expat-dev" + - C:\cygwin64\bin\bash -c "apt-cyg install cmake zlib-devel expat-devel python38 python38-pip" build_script: - cmd: rem set CMD=mkdir -p build From 7adc42e9f29845fde97ffc8a022b722d50359175 Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Sun, 13 Dec 2020 00:25:31 +0000 Subject: [PATCH 29/43] libexpat-devel --- mingw.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mingw.yml b/mingw.yml index 2e83efa7..8d600be9 100644 --- a/mingw.yml +++ b/mingw.yml @@ -25,7 +25,7 @@ install: - cd %APPVEYOR_BUILD_FOLDER% - set "PATH=c:\cygwin64\usr\local\bin;c:\cygwin64\bin;c:\cygwin64\usr\bin;c:\cygwin64\usr\sbin;" - C:\cygwin64\bin\bash -c "wget https://raw.githubusercontent.com/transcode-open/apt-cyg/master/apt-cyg ; chmod +x apt-cyg; mv apt-cyg /usr/local/bin" - - C:\cygwin64\bin\bash -c "apt-cyg install cmake zlib-devel expat-devel python38 python38-pip" + - C:\cygwin64\bin\bash -c "apt-cyg install cmake zlib-devel libexpat-devel python38 python38-pip" build_script: - cmd: rem set CMD=mkdir -p build From a111e6f61947da72f278d72fdf5f27ec4f7d53c3 Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Sun, 13 Dec 2020 00:35:32 +0000 Subject: [PATCH 30/43] Use C++98 and run python tests. --- mingw.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mingw.yml b/mingw.yml index 8d600be9..297efda8 100644 --- a/mingw.yml +++ b/mingw.yml @@ -26,6 +26,7 @@ install: - set "PATH=c:\cygwin64\usr\local\bin;c:\cygwin64\bin;c:\cygwin64\usr\bin;c:\cygwin64\usr\sbin;" - C:\cygwin64\bin\bash -c "wget https://raw.githubusercontent.com/transcode-open/apt-cyg/master/apt-cyg ; chmod +x apt-cyg; mv apt-cyg /usr/local/bin" - C:\cygwin64\bin\bash -c "apt-cyg install cmake zlib-devel libexpat-devel python38 python38-pip" + - C:\cygwin64\bin\bash -c "python -m pip install --upgrade pip;pip3.exe install lxml" build_script: - cmd: rem set CMD=mkdir -p build @@ -45,8 +46,9 @@ build_script: - cmd: set "PATH=c:\cygwin64\usr\local\bin;c:\cygwin64\bin;c:\cygwin64\usr\bin;c:\cygwin64\usr\sbin;" - cmd: set CMD=mkdir -p build - cmd: set CMD=%CMD%; cd build - - cmd: set CMD=%CMD%;cmake .. + - cmd: set CMD=%CMD%;cmake .. -DCMAKE_CXX_STANDARD=98 -DCMAKE_CXX_FLAGS=-Wno-deprecated - cmd: set CMD=%CMD%; make + - cmd: set CMD=%CMD%; make python_tests - cmd: echo %CMD% - cd %APPVEYOR_BUILD_FOLDER% - cmd: C:\cygwin64\bin\bash -c "%CMD%" From cec9a333f668c25e6f8784390b725126faf41313 Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Sun, 13 Dec 2020 00:39:52 +0000 Subject: [PATCH 31/43] Install pip --- mingw.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mingw.yml b/mingw.yml index 297efda8..2bbe3108 100644 --- a/mingw.yml +++ b/mingw.yml @@ -26,7 +26,8 @@ install: - set "PATH=c:\cygwin64\usr\local\bin;c:\cygwin64\bin;c:\cygwin64\usr\bin;c:\cygwin64\usr\sbin;" - C:\cygwin64\bin\bash -c "wget https://raw.githubusercontent.com/transcode-open/apt-cyg/master/apt-cyg ; chmod +x apt-cyg; mv apt-cyg /usr/local/bin" - C:\cygwin64\bin\bash -c "apt-cyg install cmake zlib-devel libexpat-devel python38 python38-pip" - - C:\cygwin64\bin\bash -c "python -m pip install --upgrade pip;pip3.exe install lxml" + - C:\cygwin64\bin\bash -c "python3 -m pip install --upgrade pip" + - C:\cygwin64\bin\bash -c "pip install lxml" build_script: - cmd: rem set CMD=mkdir -p build From 1157f87a8849fcf7b02b1920c98fa7de7eda56d2 Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Sun, 13 Dec 2020 00:41:39 +0000 Subject: [PATCH 32/43] Trying to get pip to install. --- mingw.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/mingw.yml b/mingw.yml index 2bbe3108..ed5886b8 100644 --- a/mingw.yml +++ b/mingw.yml @@ -26,7 +26,6 @@ install: - set "PATH=c:\cygwin64\usr\local\bin;c:\cygwin64\bin;c:\cygwin64\usr\bin;c:\cygwin64\usr\sbin;" - C:\cygwin64\bin\bash -c "wget https://raw.githubusercontent.com/transcode-open/apt-cyg/master/apt-cyg ; chmod +x apt-cyg; mv apt-cyg /usr/local/bin" - C:\cygwin64\bin\bash -c "apt-cyg install cmake zlib-devel libexpat-devel python38 python38-pip" - - C:\cygwin64\bin\bash -c "python3 -m pip install --upgrade pip" - C:\cygwin64\bin\bash -c "pip install lxml" build_script: From 19fe56071a312b87f2a3a88307b03acac16fabc2 Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Sun, 13 Dec 2020 00:43:34 +0000 Subject: [PATCH 33/43] Com'on pip3. --- mingw.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mingw.yml b/mingw.yml index ed5886b8..65bc03ca 100644 --- a/mingw.yml +++ b/mingw.yml @@ -26,7 +26,7 @@ install: - set "PATH=c:\cygwin64\usr\local\bin;c:\cygwin64\bin;c:\cygwin64\usr\bin;c:\cygwin64\usr\sbin;" - C:\cygwin64\bin\bash -c "wget https://raw.githubusercontent.com/transcode-open/apt-cyg/master/apt-cyg ; chmod +x apt-cyg; mv apt-cyg /usr/local/bin" - C:\cygwin64\bin\bash -c "apt-cyg install cmake zlib-devel libexpat-devel python38 python38-pip" - - C:\cygwin64\bin\bash -c "pip install lxml" + - C:\cygwin64\bin\bash -c "pip3 install lxml" build_script: - cmd: rem set CMD=mkdir -p build From 5c7731f4f06e4fc14ef5c8a355fc48b517291ab4 Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Sun, 13 Dec 2020 00:46:05 +0000 Subject: [PATCH 34/43] Install libxml2 and libxslt --- mingw.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mingw.yml b/mingw.yml index 65bc03ca..48eba253 100644 --- a/mingw.yml +++ b/mingw.yml @@ -25,7 +25,7 @@ install: - cd %APPVEYOR_BUILD_FOLDER% - set "PATH=c:\cygwin64\usr\local\bin;c:\cygwin64\bin;c:\cygwin64\usr\bin;c:\cygwin64\usr\sbin;" - C:\cygwin64\bin\bash -c "wget https://raw.githubusercontent.com/transcode-open/apt-cyg/master/apt-cyg ; chmod +x apt-cyg; mv apt-cyg /usr/local/bin" - - C:\cygwin64\bin\bash -c "apt-cyg install cmake zlib-devel libexpat-devel python38 python38-pip" + - C:\cygwin64\bin\bash -c "apt-cyg install cmake zlib-devel libexpat-devel libxml2-devel libxslt-devel python38 python38-pip" - C:\cygwin64\bin\bash -c "pip3 install lxml" build_script: From 406119c018ba79a53ec1d7b0ebde8c8e377114f4 Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Sun, 13 Dec 2020 00:53:18 +0000 Subject: [PATCH 35/43] python38-libxml2 --- mingw.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mingw.yml b/mingw.yml index 48eba253..2fc2bf2f 100644 --- a/mingw.yml +++ b/mingw.yml @@ -25,8 +25,8 @@ install: - cd %APPVEYOR_BUILD_FOLDER% - set "PATH=c:\cygwin64\usr\local\bin;c:\cygwin64\bin;c:\cygwin64\usr\bin;c:\cygwin64\usr\sbin;" - C:\cygwin64\bin\bash -c "wget https://raw.githubusercontent.com/transcode-open/apt-cyg/master/apt-cyg ; chmod +x apt-cyg; mv apt-cyg /usr/local/bin" - - C:\cygwin64\bin\bash -c "apt-cyg install cmake zlib-devel libexpat-devel libxml2-devel libxslt-devel python38 python38-pip" - - C:\cygwin64\bin\bash -c "pip3 install lxml" + - C:\cygwin64\bin\bash -c "apt-cyg install cmake zlib-devel libexpat-devel libxml2-devel libxslt-devel python38 python38-pip python38-libxml2" + - C:\cygwin64\bin\bash -c "/usr/bin/python3.8.exe -m pip install --upgrade pip" build_script: - cmd: rem set CMD=mkdir -p build From 8d04449053beee67832ae7ec728793775dc1ab13 Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Sun, 13 Dec 2020 01:06:26 +0000 Subject: [PATCH 36/43] Build and test both MinGW/msys2 and Cygwin64 --- mingw.yml | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/mingw.yml b/mingw.yml index 2fc2bf2f..2da60d54 100644 --- a/mingw.yml +++ b/mingw.yml @@ -1,10 +1,7 @@ init: - echo %PYTHON% -environment: - PYTHON: "C:/Python37-x64" - - matrix: +matrix: - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 INTEGRATION_TESTS: 1 ARCHITECTURE: x86_64 @@ -17,7 +14,7 @@ shallow_clone: true install: - echo %APPVEYOR_BUILD_FOLDER% - set "PATH=c:\msys64\mingw64\bin;c:\msys64\usr\bin;c:\msys64\usr\local\bin;" - - echo C:\msys64\usr\bin\bash -c "python -m pip install --upgrade pip;pip3.exe install lxml ; for i in base-devel git coreutils dos2unix tar diffutils make \ + - C:\msys64\usr\bin\bash -c "python -m pip install --upgrade pip;pip3.exe install lxml ; for i in base-devel git coreutils dos2unix tar diffutils make \ mingw-w64-x86_64-toolchain mingw-w64-x86_64-gcc mingw-w64-x86_64-gdb \ mingw-w64-x86_64-cmake mingw-w64-x86_64-gettext mingw-w64-x86_64-python3 \ mingw-w64-x86_64-libexpat mingw-w64-x86_64-libiconv mingw-w64-x86_64-zlib \ @@ -29,22 +26,23 @@ install: - C:\cygwin64\bin\bash -c "/usr/bin/python3.8.exe -m pip install --upgrade pip" build_script: - - cmd: rem set CMD=mkdir -p build - - cmd: rem set CMD=%CMD%; cd build - - cmd: rem set CMD=%CMD%; cmake .. -G 'Unix Makefiles' -DCMAKE_CXX_STANDARD=98 -DCMAKE_CXX_FLAGS=-Wno-deprecated - - cmd: rem set CMD=%CMD%; cmake --build . --config Release + - cmd: set CMD=mkdir -p build + - cmd: set CMD=%CMD%; cd build + - cmd: set CMD=%CMD%; cmake .. -G 'Unix Makefiles' -DCMAKE_CXX_STANDARD=98 -DCMAKE_CXX_FLAGS=-Wno-deprecated + - cmd: set CMD=%CMD%; cmake --build . --config Release - cmd: rem echo %CMD% - cd %APPVEYOR_BUILD_FOLDER% - - cmd: rem C:\msys64\usr\bin\bash -c "%CMD%" - - cmd: rem set CMD=which python3 python - - cmd: rem set CMD=%CMD%; python --version - - cmd: rem set CMD=%CMD%; build/bin/exiv2 --verbose --version; pwd ; ls -l - - cmd: rem set CMD=%CMD%; cd build ; cmake --build . --config Release --target python_tests - - cmd: rem echo %CMD% + - cmd: C:\msys64\usr\bin\bash -c "%CMD%" + - cmd: set CMD=which python3 python + - cmd: set CMD=%CMD%; python --version + - cmd: set CMD=%CMD%; build/bin/exiv2 --verbose --version; pwd ; ls -l + - cmd: set CMD=%CMD%; cd build ; cmake --build . --config Release --target python_tests + - cmd: echo %CMD% - cd %APPVEYOR_BUILD_FOLDER% - cmd: C:\msys64\usr\bin\bash -c "%CMD%" - cmd: set "PATH=c:\cygwin64\usr\local\bin;c:\cygwin64\bin;c:\cygwin64\usr\bin;c:\cygwin64\usr\sbin;" - - cmd: set CMD=mkdir -p build + - cmd: set CMD=rm -rf build + - cmd: set CMD=%CMD%; mkdir -p build - cmd: set CMD=%CMD%; cd build - cmd: set CMD=%CMD%;cmake .. -DCMAKE_CXX_STANDARD=98 -DCMAKE_CXX_FLAGS=-Wno-deprecated - cmd: set CMD=%CMD%; make From f267834352b32eb6201bbd1546b2fd54ce5be267 Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Sun, 13 Dec 2020 01:13:24 +0000 Subject: [PATCH 37/43] Fix matrix syntax. --- mingw.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mingw.yml b/mingw.yml index 2da60d54..ea3901d3 100644 --- a/mingw.yml +++ b/mingw.yml @@ -1,7 +1,7 @@ init: - echo %PYTHON% -matrix: + matrix: - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 INTEGRATION_TESTS: 1 ARCHITECTURE: x86_64 From 4dba5bfe603f6e1568b25b4e207230a28de76133 Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Sun, 13 Dec 2020 01:15:26 +0000 Subject: [PATCH 38/43] Try again. --- mingw.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mingw.yml b/mingw.yml index ea3901d3..9f0b14af 100644 --- a/mingw.yml +++ b/mingw.yml @@ -1,6 +1,9 @@ init: - echo %PYTHON% +environment: + PYTHON: "C:/Python37-x64" + matrix: - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 INTEGRATION_TESTS: 1 From 26004854bb8a63e3ed13568fd021e2d8cf87678c Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Sun, 13 Dec 2020 01:35:03 +0000 Subject: [PATCH 39/43] Build Cygwin and MinGW in parallel. --- mingw.yml | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/mingw.yml b/mingw.yml index 9f0b14af..01cbc700 100644 --- a/mingw.yml +++ b/mingw.yml @@ -6,6 +6,15 @@ environment: matrix: - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 + BUILD: MINGW64 + INTEGRATION_TESTS: 1 + ARCHITECTURE: x86_64 + UNIT_TESTS: 1 + WEBREADY: False + WARNINGS_AS_ERRORS: ON + matrix: + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 + BUILD: CYGWIN64 INTEGRATION_TESTS: 1 ARCHITECTURE: x86_64 UNIT_TESTS: 1 @@ -35,14 +44,14 @@ build_script: - cmd: set CMD=%CMD%; cmake --build . --config Release - cmd: rem echo %CMD% - cd %APPVEYOR_BUILD_FOLDER% - - cmd: C:\msys64\usr\bin\bash -c "%CMD%" + - cmd: if "%BUILD%"=="MINGW64" then C:\msys64\usr\bin\bash -c "%CMD%" - cmd: set CMD=which python3 python - cmd: set CMD=%CMD%; python --version - cmd: set CMD=%CMD%; build/bin/exiv2 --verbose --version; pwd ; ls -l - cmd: set CMD=%CMD%; cd build ; cmake --build . --config Release --target python_tests - cmd: echo %CMD% - cd %APPVEYOR_BUILD_FOLDER% - - cmd: C:\msys64\usr\bin\bash -c "%CMD%" + - cmd: if "%BUILD%"=="MINGW64" C:\msys64\usr\bin\bash -c "%CMD%" - cmd: set "PATH=c:\cygwin64\usr\local\bin;c:\cygwin64\bin;c:\cygwin64\usr\bin;c:\cygwin64\usr\sbin;" - cmd: set CMD=rm -rf build - cmd: set CMD=%CMD%; mkdir -p build @@ -52,5 +61,5 @@ build_script: - cmd: set CMD=%CMD%; make python_tests - cmd: echo %CMD% - cd %APPVEYOR_BUILD_FOLDER% - - cmd: C:\cygwin64\bin\bash -c "%CMD%" + - cmd: if "%BUILD%"=="CYGWIN64" C:\cygwin64\bin\bash -c "%CMD%" From 90b579cf55be1ab700bdbe3b46bb16853526d941 Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Sun, 13 Dec 2020 01:36:42 +0000 Subject: [PATCH 40/43] Try again. --- mingw.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/mingw.yml b/mingw.yml index 01cbc700..acdfc25f 100644 --- a/mingw.yml +++ b/mingw.yml @@ -12,7 +12,6 @@ environment: UNIT_TESTS: 1 WEBREADY: False WARNINGS_AS_ERRORS: ON - matrix: - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 BUILD: CYGWIN64 INTEGRATION_TESTS: 1 From 3e18145e1ebeab0b3a0141a43b4644ae343159ec Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Sun, 13 Dec 2020 01:39:14 +0000 Subject: [PATCH 41/43] Fixing typo --- mingw.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mingw.yml b/mingw.yml index acdfc25f..b87d2999 100644 --- a/mingw.yml +++ b/mingw.yml @@ -43,7 +43,7 @@ build_script: - cmd: set CMD=%CMD%; cmake --build . --config Release - cmd: rem echo %CMD% - cd %APPVEYOR_BUILD_FOLDER% - - cmd: if "%BUILD%"=="MINGW64" then C:\msys64\usr\bin\bash -c "%CMD%" + - cmd: if "%BUILD%"=="MINGW64" C:\msys64\usr\bin\bash -c "%CMD%" - cmd: set CMD=which python3 python - cmd: set CMD=%CMD%; python --version - cmd: set CMD=%CMD%; build/bin/exiv2 --verbose --version; pwd ; ls -l From cde5277ed122716ae869b8c714d7872677f4c0ab Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Sun, 13 Dec 2020 01:44:47 +0000 Subject: [PATCH 42/43] Rename appveyor configuration file. --- mingw.yml => appveyor_mingw_cygwin.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename mingw.yml => appveyor_mingw_cygwin.yml (100%) diff --git a/mingw.yml b/appveyor_mingw_cygwin.yml similarity index 100% rename from mingw.yml rename to appveyor_mingw_cygwin.yml From d3d0ceca3c87ca50c4250fb703a8102751689d74 Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Sun, 13 Dec 2020 02:22:54 +0000 Subject: [PATCH 43/43] Modified install to only install what's required for BUILD --- appveyor_mingw_cygwin.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/appveyor_mingw_cygwin.yml b/appveyor_mingw_cygwin.yml index b87d2999..31f054d4 100644 --- a/appveyor_mingw_cygwin.yml +++ b/appveyor_mingw_cygwin.yml @@ -24,17 +24,17 @@ shallow_clone: true install: - echo %APPVEYOR_BUILD_FOLDER% - - set "PATH=c:\msys64\mingw64\bin;c:\msys64\usr\bin;c:\msys64\usr\local\bin;" - - C:\msys64\usr\bin\bash -c "python -m pip install --upgrade pip;pip3.exe install lxml ; for i in base-devel git coreutils dos2unix tar diffutils make \ + - if "%BUILD%"=="MINGW64" set "PATH=c:\msys64\mingw64\bin;c:\msys64\usr\bin;c:\msys64\usr\local\bin;" + - if "%BUILD%"=="MINGW64" C:\msys64\usr\bin\bash -c "python -m pip install --upgrade pip;pip3.exe install lxml ; for i in base-devel git coreutils dos2unix tar diffutils make \ mingw-w64-x86_64-toolchain mingw-w64-x86_64-gcc mingw-w64-x86_64-gdb \ mingw-w64-x86_64-cmake mingw-w64-x86_64-gettext mingw-w64-x86_64-python3 \ mingw-w64-x86_64-libexpat mingw-w64-x86_64-libiconv mingw-w64-x86_64-zlib \ mingw-w64-x86_64-gtest ; do (echo y | pacman -S $i) ; done - cd %APPVEYOR_BUILD_FOLDER% - - set "PATH=c:\cygwin64\usr\local\bin;c:\cygwin64\bin;c:\cygwin64\usr\bin;c:\cygwin64\usr\sbin;" - - C:\cygwin64\bin\bash -c "wget https://raw.githubusercontent.com/transcode-open/apt-cyg/master/apt-cyg ; chmod +x apt-cyg; mv apt-cyg /usr/local/bin" - - C:\cygwin64\bin\bash -c "apt-cyg install cmake zlib-devel libexpat-devel libxml2-devel libxslt-devel python38 python38-pip python38-libxml2" - - C:\cygwin64\bin\bash -c "/usr/bin/python3.8.exe -m pip install --upgrade pip" + - if "%BUILD%"=="CYGWIN64" set "PATH=c:\cygwin64\usr\local\bin;c:\cygwin64\bin;c:\cygwin64\usr\bin;c:\cygwin64\usr\sbin;" + - if "%BUILD%"=="CYGWIN64" C:\cygwin64\bin\bash -c "wget https://raw.githubusercontent.com/transcode-open/apt-cyg/master/apt-cyg ; chmod +x apt-cyg; mv apt-cyg /usr/local/bin" + - if "%BUILD%"=="CYGWIN64" C:\cygwin64\bin\bash -c "apt-cyg install cmake zlib-devel libexpat-devel libxml2-devel libxslt-devel python38 python38-pip python38-libxml2" + - if "%BUILD%"=="CYGWIN64" C:\cygwin64\bin\bash -c "/usr/bin/python3.8.exe -m pip install --upgrade pip" build_script: - cmd: set CMD=mkdir -p build