[go: up one dir, main page]

Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[vcpkg-make] Add new port #39050

Open
wants to merge 242 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
242 commits
Select commit Hold shift + click to select a range
b499ded
vcpkg-make initial idea
Neumann-A Aug 15, 2023
62eb284
don't run ci
Neumann-A Aug 15, 2023
fffa564
Make vcpkg portfile execution debugable
Neumann-A Aug 16, 2023
2e1d32a
WIP
Neumann-A Aug 17, 2023
36ce65c
more WIP
Neumann-A Aug 17, 2023
23d3308
install wrappers
Neumann-A Aug 18, 2023
92457bf
keep the configure_make somewhere for reference
Neumann-A Aug 18, 2023
ab57ae7
add function to warn about spaces
Neumann-A Aug 18, 2023
7918e80
strip whitespaces
Neumann-A Aug 18, 2023
d3b8148
WIP
Neumann-A Aug 18, 2023
1f56817
determine configure triplet
Neumann-A Aug 18, 2023
3ee0aa0
wip
Neumann-A Aug 18, 2023
799b4c8
WIP
Neumann-A Aug 18, 2023
eaf0b67
WIP . move more stuff over.
Neumann-A Aug 23, 2023
c0dc7d7
WIP: create vcpkg_make_install
Neumann-A Aug 25, 2023
c5381ab
Merge remote-tracking branch 'upstream/master' into vcpkg-make
Neumann-A Aug 25, 2023
3933374
WIP code tuning
Neumann-A Aug 25, 2023
3952202
rename function to z_vcpkg_make_get_configure_triplets
Neumann-A Aug 25, 2023
407d3f8
Merge branch 'vcpkg-make' of https://github.com/Neumann-A/vcpkg into …
Neumann-A Aug 25, 2023
0b0df8d
add configure cache
Neumann-A Aug 27, 2023
facb152
More wip
Neumann-A Aug 28, 2023
55ab880
fix includes
Neumann-A Aug 28, 2023
fb6f0b0
fix automatic file include
Neumann-A Aug 28, 2023
1bf57d6
make gmp use the new stuff
Neumann-A Aug 28, 2023
a3621d3
fix stuff to configure (build flags are missing somehow)
Neumann-A Aug 28, 2023
02dab22
more fixes
Neumann-A Aug 28, 2023
f9fc193
cleanup message
Neumann-A Aug 28, 2023
06dd260
remove "
Neumann-A Aug 28, 2023
051adc4
adjust tasks to test gmp
Neumann-A Aug 28, 2023
5a181bf
move logfile analysis
Neumann-A Aug 28, 2023
a341a3d
minor fixes
Neumann-A Aug 28, 2023
98f78da
revert pipeline
Neumann-A Aug 28, 2023
ce6f56f
backup path
Neumann-A Aug 29, 2023
6434434
rename files
Neumann-A Aug 31, 2023
c7f2cc1
create vcpkg-scripts and move stuff around
Neumann-A Aug 31, 2023
1430692
move more stuff
Neumann-A Aug 31, 2023
db55c39
more z_ prefixes
Neumann-A Aug 31, 2023
1925080
fix include naming
Neumann-A Aug 31, 2023
5092636
fix linux
Neumann-A Sep 1, 2023
b3038de
fix linux ?
Neumann-A Sep 1, 2023
3daa802
use umask
Neumann-A Sep 1, 2023
8e12b77
lists everywhere
Neumann-A Sep 1, 2023
d896766
play with configure_env
Neumann-A Sep 1, 2023
569bbf0
get logs
Neumann-A Sep 6, 2023
e91d8cd
retry
Neumann-A Sep 7, 2023
85307d2
print message
Neumann-A Sep 7, 2023
af115c9
move stuff to the correct location
Neumann-A Sep 7, 2023
1c82d5a
more changes
Neumann-A Sep 8, 2023
636bf54
next try to figure out where abiflags get ignored
Neumann-A Sep 12, 2023
f17b7a0
more debugging
Neumann-A Sep 12, 2023
75f71e5
was this the issue?
Neumann-A Sep 12, 2023
9a22df8
remove env settinng
Neumann-A Sep 12, 2023
aac6d97
use correct config var
Neumann-A Sep 13, 2023
ab1dfff
cleanup
Neumann-A Sep 13, 2023
9039911
revert zlib
Neumann-A Sep 13, 2023
4737d7f
revert pipeline
Neumann-A Sep 13, 2023
cc46900
dont error gmp
Neumann-A Sep 13, 2023
43f84ae
guard extra opts correctly
Neumann-A Sep 14, 2023
14d1540
fix bugs
Neumann-A Sep 15, 2023
5dbcba9
Merge remote-tracking branch 'upstream/master' into vcpkg-make
Neumann-A Sep 22, 2023
4a6c3ae
remove vcpkg-make-test to make the PR look green
Neumann-A Sep 22, 2023
eccecb3
use --x-cmake(-port)?-debug
Neumann-A Sep 22, 2023
636ee01
Merge branch 'vcpkg-make' of https://github.com/Neumann-A/vcpkg into …
Neumann-A Sep 22, 2023
30037a3
Merge remote-tracking branch 'upstream/master' into vcpkg-make
Neumann-A Sep 24, 2023
68e8a17
format manifest
Neumann-A Sep 24, 2023
0262490
v db
Neumann-A Sep 24, 2023
132a1fd
Merge branch 'microsoft:master' into vcpkg-make
Neumann-A Sep 26, 2023
be02f37
Merge branch 'master' into vcpkg-make
Neumann-A Oct 5, 2023
3d05e58
Apply suggestions from code review
Neumann-A Oct 5, 2023
ea23f7a
move general stuff to vcpkg-scripts
Neumann-A Oct 5, 2023
a2384ee
v db
Neumann-A Oct 5, 2023
594951e
Merge remote-tracking branch 'upstream/master' into vcpkg-make
Neumann-A Nov 29, 2023
4ca2935
Apply suggestions from code review
Neumann-A Nov 29, 2023
30d7344
Merge branch 'vcpkg-make' of https://github.com/Neumann-A/vcpkg into …
Neumann-A Nov 29, 2023
d7de9e3
revert user vscode settings
Neumann-A Nov 29, 2023
bc55b5f
add missing transformation for 'current_installed_dir_msys'
Neumann-A Nov 29, 2023
db21699
correctly use VCPKG_CMAKE_CONFIGURE_OPTIONS
Neumann-A Nov 29, 2023
40ca608
switch x264 to vcpkg-make
Neumann-A Nov 29, 2023
77dc21c
Looks like vcpkg-make needs to write response files for MSVC
Neumann-A Nov 29, 2023
931e197
move vcpkg-scripts back into vcpkg-make
Neumann-A Dec 1, 2023
820014b
Fix flags passing
Neumann-A Dec 1, 2023
ee20937
use response file
Neumann-A Dec 1, 2023
2e9ee94
add USE_RESPONSE_FILES
Neumann-A Dec 2, 2023
825d759
switch coin-or-cbc
Neumann-A Dec 2, 2023
411337e
add NASM into PATH for android
Neumann-A Dec 2, 2023
774470b
make env override platform consistent.
Neumann-A Dec 5, 2023
d5c4a4b
bump port version
Neumann-A Dec 6, 2023
285e34a
v db
Neumann-A Dec 6, 2023
ffe8e94
Apply a few suggestions from code review
Neumann-A Jan 13, 2024
bab5cb1
rename missed NO_WRAPPERS
Neumann-A Jan 13, 2024
4d34bee
v db
Neumann-A Jan 15, 2024
5215e66
Merge remote-tracking branch 'upstream/master' into vcpkg-make
Neumann-A Jan 15, 2024
b65888c
v db
Neumann-A Jan 15, 2024
32c3953
Merge remote-tracking branch 'upstream/master' into vcpkg-make
Neumann-A Jan 29, 2024
c859085
v db
Neumann-A Jan 29, 2024
8cecf44
Merge remote-tracking branch 'upstream/master' into vcpkg-make
Neumann-A Feb 4, 2024
ecdd5cb
revert changes to libbson
Neumann-A Feb 4, 2024
00c37b0
remove vcpkg_autotools_configure
Neumann-A Feb 4, 2024
4957b2f
remove libbson v db
Neumann-A Feb 4, 2024
d5e0f13
v db
Neumann-A Feb 4, 2024
853f547
Merge branch 'microsoft:master' into vcpkg-make
Neumann-A Feb 8, 2024
2c0f274
Merge remote-tracking branch 'upstream/master' into vcpkg-make
Neumann-A Apr 29, 2024
f730e39
remove cacheing
Neumann-A Apr 29, 2024
39d86c1
remove ADD_BIN_TO_PATH
Neumann-A Apr 29, 2024
dfb60ab
remove POST_CONFIGURE_CMAKE_COMMANDS
Neumann-A Apr 29, 2024
cd156fe
remove some comments
Neumann-A Apr 29, 2024
e590d18
v db
Neumann-A Apr 29, 2024
4b53ef9
Merge remote-tracking branch 'upstream/master' into vcpkg-make
Neumann-A May 1, 2024
e528798
port libidn2 to vcpkg-make
Neumann-A May 1, 2024
7af0699
v db
Neumann-A May 1, 2024
940d428
Merge remote-tracking branch 'upstream/master' into vcpkg-make
Neumann-A May 15, 2024
a94f56b
Remove SHELL as a toplevel option for now
Neumann-A May 15, 2024
0b8b6cc
v db
Neumann-A May 15, 2024
c5808a9
always filter out common CFLAGS and CXXFLAGS
May 30, 2024
da7ded8
merge
May 30, 2024
be51b76
oops
May 31, 2024
bdf6e7d
port version
May 31, 2024
1825b65
version db
May 31, 2024
774e2b7
Never filter out CPPFLAGS out of CFLAGS and CXXFLAGS
Jun 3, 2024
ed54069
always filter out CFLAGS; fix bug
Jun 4, 2024
2795aa3
version db
Jun 4, 2024
47785e5
use separate_arguments for pattern recognition
Jun 4, 2024
a36269b
vdb
Jun 4, 2024
f629615
attempting to add unit tests
Jun 6, 2024
347e5f9
unit tests broken
Jun 6, 2024
4de7134
Test 1 pass
Jun 6, 2024
a4d8693
z_vcpkg_make_prepare_compile_flags tested
Jun 6, 2024
e0d8fdc
z_vcpkg_make_determine_arch tested
Jun 6, 2024
1dd2bcf
z_vcpkg_make_determine_host/target_arch tested
Jun 6, 2024
b47fe01
fix z_vcpkg_make_determine_host/target_arch on windows
Jun 7, 2024
cb39bcd
factor out lib flag prep to its own function and add test cases
Jun 10, 2024
9f05d17
code cleanup
Jun 10, 2024
81805c7
fix function signature; add test cases for z_vcpkg_convert_to_msys_path
Jun 10, 2024
18f7501
remove unused function
Jun 10, 2024
e56ffac
remove unused code and comments
Jun 10, 2024
ee18e42
use CMAKE_HOST_32)
Jun 19, 2024
98389a5
remove commented code
Jun 19, 2024
61ef07a
resolved merge conflicts
Jun 19, 2024
17980bc
port version bump
Jun 19, 2024
4aeb4ec
version db
Jun 19, 2024
f9ae785
version db vcpkg-make
Jun 19, 2024
32d472a
add license to test port
Jun 19, 2024
798b99b
version db
Jun 19, 2024
409d065
use VCPKG_HOST_IS_OSX instead of APPLE
Jun 20, 2024
07488d7
change NO_CPPFLAGS to DISABLE_CPPFLAGS
Jun 24, 2024
b82d813
version db
Jun 24, 2024
558810d
merge
Jun 24, 2024
66cab69
bump port version
Jun 24, 2024
b534dff
version db
Jun 24, 2024
e31f8a6
version db vcpkg-make port
Jun 24, 2024
3d4c6b9
update version DB
Jun 24, 2024
5b9fafe
merge with main
Jun 27, 2024
16cbf75
convert x264 port
Jun 27, 2024
a52270d
version db x264
Jun 27, 2024
80ac551
fix merge conflict for coin-or-cbc
Jun 27, 2024
e27551f
version db coin-or-cbc
Jun 27, 2024
35cdb5a
rename NO_DEFAULT_OPTIONS to DISABLE_DEFAULT_OPTIONS
Jun 27, 2024
11b0fc3
Chane NO_MSVC_FLAG_ESCAPING to DISABLE_MSVC_FLAG_ESCAPING
Jun 27, 2024
dee7fc5
version db
Jun 27, 2024
c56a88b
try running autoreconf
Jul 1, 2024
62cfea4
version db
Jul 1, 2024
eb987f6
Merge remote-tracking branch 'upstream/master' into vcpkg_make_port
Jul 2, 2024
db36eba
merge
Jul 2, 2024
7f550b0
change NO_DESTDIR to DISABLE_DESTDIR
Jul 2, 2024
d7fc373
version db
Jul 2, 2024
cdbfa20
version db overwrite libidn2
Jul 2, 2024
f5ff81b
use response files by default
Aug 5, 2024
c8189c8
remove references to USE_RESPONSE_FILE
Aug 5, 2024
78456be
version db
Aug 5, 2024
09503da
remove unused options SHELL and unused options in vcpkg_make_get_shell
Aug 5, 2024
29cfd7f
remove SHELL
Aug 5, 2024
7f419d1
fix test case
Aug 6, 2024
724b666
version db
Aug 6, 2024
1428eed
remove SUBPATH from vcpkg_make_install
Aug 8, 2024
441e66e
remove DISABLE_DESTDIR option
Aug 8, 2024
8bae048
remove DISABLE_MSVC_FLAG_ESCAPING
Aug 8, 2024
8bc30d2
version db
Aug 8, 2024
d3f1c89
add absolute-path patch
Aug 9, 2024
aa7d433
version db
Aug 9, 2024
9265e34
remove response files as default
JavierMatosD Aug 19, 2024
48078e9
version db
JavierMatosD Aug 19, 2024
c43132e
remove unrequired patch
JavierMatosD Aug 19, 2024
0a83e2f
version db
JavierMatosD Aug 19, 2024
7c87a3f
update tests
JavierMatosD Aug 19, 2024
87b3804
remove patch from gmp
JavierMatosD Aug 19, 2024
75c4137
version db
JavierMatosD Aug 19, 2024
5926e4e
use official automake and cleanup
Sep 6, 2024
eb5c4f7
fix test cases
Sep 6, 2024
0845a72
update wrapper
Sep 10, 2024
1b0a3e3
update ar-lib wrapper to consider clang-cl
Sep 10, 2024
e236fe1
version db
Sep 10, 2024
35c0614
LANGUAGES is list -> unquote
Sep 10, 2024
5bf676d
version db
Sep 10, 2024
7549ac9
simplify linker flag escaping
Sep 10, 2024
eb4a9d4
escape LANGUAGES before appending to -DVCPKG_CMAKE_CONFIGURE_OPTIONS
Sep 17, 2024
3fb4e0c
version db:
Sep 17, 2024
40dd8ab
undo changes to cmake_get_vars
Sep 17, 2024
bc87330
undo again
Sep 17, 2024
4cf0581
fix linker flag escaping
JavierMatosD Sep 18, 2024
5d95e76
version db
JavierMatosD Sep 18, 2024
59aad6c
fix uwp
JavierMatosD Sep 19, 2024
3e8585e
version db
JavierMatosD Sep 19, 2024
12ab8c9
Merge remote-tracking branch 'upstream/master' into vcpkg_make_port
Sep 20, 2024
cd128ed
pass through BUILD_TRIPLET parameter
Sep 24, 2024
d761481
add comment about command construction
Sep 24, 2024
b4434ba
use updated automake with real wrappers
Sep 24, 2024
9a8f6e7
version db
Sep 24, 2024
131a6a5
rename AUTOCONFIG -> AUTORECONF
Sep 24, 2024
37debfc
version db:
Sep 24, 2024
eb27218
quote command
Sep 27, 2024
27dd773
version db
Sep 27, 2024
b7e5d36
undo command change
Sep 27, 2024
0e28e99
version db
Sep 27, 2024
2e1437a
apply dg0yts suggestions
Oct 3, 2024
3829e1c
version db
Oct 3, 2024
3fcd949
add 'arg' to cmake parse arguments and apply dg0yt test suggestions
Oct 3, 2024
2d3fdda
version db
Oct 3, 2024
40d42ba
prefer explicit copying over glob/removal
Oct 3, 2024
e576cb0
version db
Oct 3, 2024
9a253d6
undo changes to vcpkg-cmake-get-vars
Oct 3, 2024
a6fd1ea
version db
Oct 3, 2024
b6b125f
add newline EOF
Oct 3, 2024
a066cf1
merge
JavierMatosD Oct 6, 2024
8d8a04c
remove unnecessary x_ prefix
Oct 8, 2024
33f939d
don't pass triplet variables to functions
Oct 9, 2024
e3755cb
version db
Oct 9, 2024
79405cb
Merge branch 'vcpkg_make_port' of github.com:JavierMatosD/vcpkg into …
Oct 9, 2024
20e578b
minor changes
Oct 22, 2024
c48e0ac
change DISABLE_MSVC_FLAG_ESCAPING to DISABLE_MSVC_TRANSFORMATIONS
Oct 22, 2024
94c30c3
version db
Oct 22, 2024
9abb675
remove white space
Oct 22, 2024
bb99dbb
version db
Oct 22, 2024
99eeb08
test debug variants
Oct 22, 2024
8a18d49
don't compare against a particular literal
Oct 22, 2024
1d3020a
apply dg0yts changes
Oct 31, 2024
90ef0d0
version db
Oct 31, 2024
c6615f6
merge
Nov 1, 2024
bb70588
Merge remote-tracking branch 'upstream/master' into vcpkg_make_port
Nov 5, 2024
1372ea1
gmp prefer autoconf 2.71
Nov 5, 2024
a796472
version db
Nov 5, 2024
9cd0de2
fix vcpkg_acquire_msys call
Nov 5, 2024
5512566
version db
Nov 5, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
move logfile analysis
  • Loading branch information
Neumann-A committed Aug 28, 2023
commit 5a181bf41b7c55b60aa6e1b935322159dab320f1
9 changes: 4 additions & 5 deletions ports/vcpkg-make/vcpkg_make_install.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -99,13 +99,12 @@ function(vcpkg_make_install)
LOGNAME "${arg_LOGFILE_ROOT}-${target}-${TARGET_TRIPLET}-${short_buildtype}"
)
endif()
file(READ "${CURRENT_BUILDTREES_DIR}/${arg_LOGFILE_ROOT}-${target}-${TARGET_TRIPLET}-${short_buildtype}-out.log" logdata)
if(logdata MATCHES "Warning: linker path does not have real file for library")
message(FATAL_ERROR "libtool could not find a file being linked against!")
endif()
endforeach()

file(READ "${CURRENT_BUILDTREES_DIR}/${arg_LOGFILE_ROOT}-${TARGET_TRIPLET}-${short_buildtype}-out.log" logdata)
if(logdata MATCHES "Warning: linker path does not have real file for library")
message(FATAL_ERROR "libtool could not find a file being linked against!")
endif()

vcpkg_make_restore_env()

vcpkg_restore_env_variables(VARS LIB LIBPATH LIBRARY_PATH)
JavierMatosD marked this conversation as resolved.
Show resolved Hide resolved
Expand Down
Loading