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

[pdcurses] Revise portfile #22092

Merged
merged 5 commits into from
Dec 22, 2021
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
21 changes: 21 additions & 0 deletions ports/pdcurses/nmake-install.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
diff --git a/wincon/Makefile.vc b/wincon/Makefile.vc
index 80c4689..1bae388 100644
--- a/wincon/Makefile.vc
+++ b/wincon/Makefile.vc
@@ -118,3 +118,16 @@ tui.obj: $(demodir)\tui.c $(demodir)\tui.h

tuidemo.obj: $(demodir)\tuidemo.c
$(BUILD) -I$(demodir) $(demodir)\tuidemo.c
+
+install: all
+ -mkdir $(INSTDIR)\lib
+ copy pdcurses.lib $(INSTDIR)\lib
+!ifdef DLL
+ -mkdir $(INSTDIR)\bin
+ copy pdcurses.dll $(INSTDIR)\bin
+!endif
+!ifndef SKIP_HEADERS
+ -mkdir $(INSTDIR)\include
+ copy $(PDCURSES_SRCDIR)\curses.h $(INSTDIR)\include
+ copy $(PDCURSES_SRCDIR)\panel.h $(INSTDIR)\include
+!endif
98 changes: 35 additions & 63 deletions ports/pdcurses/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,73 +1,45 @@
vcpkg_check_linkage(ONLY_DYNAMIC_CRT)

find_program(NMAKE nmake)

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO wmcbrine/PDCurses
REF 6c1f95c4fa9f9f105879c2d99dd72a5bf335c046 # 3.9
SHA512 2d682a3516baaa58a97854aca64d985768b7af76d998240b54afc57ddf2a44894835a1748888f8dd7c1cc8045ede77488284f8adf1b73878879b4b4d3391218d
HEAD_REF master
PATCHES
nmake-install.patch
)

set(PDC_NMAKE_CMD ${NMAKE} /A -f ${SOURCE_PATH}/wincon/Makefile.vc WIDE=Y UTF8=Y)

set(PDC_NMAKE_CWD ${SOURCE_PATH}/wincon)
set(PDC_PDCLIB ${SOURCE_PATH}/wincon/pdcurses)

if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
set(PDC_NMAKE_CMD ${PDC_NMAKE_CMD} DLL=Y)
endif()

message(STATUS "Build ${TARGET_TRIPLET}-rel")
vcpkg_execute_required_process(
COMMAND ${PDC_NMAKE_CMD}
WORKING_DIRECTORY ${PDC_NMAKE_CWD}
LOGNAME build-${TARGET_TRIPLET}-rel
)
message(STATUS "Build ${TARGET_TRIPLET}-rel done")

file (
COPY ${PDC_PDCLIB}.lib
DESTINATION ${CURRENT_PACKAGES_DIR}/lib
)
if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
file (
COPY ${PDC_PDCLIB}.dll
DESTINATION ${CURRENT_PACKAGES_DIR}/bin

if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
cmake_path(NATIVE_PATH SOURCE_PATH PDCURSES_SRCDIR)
cmake_path(NATIVE_PATH CURRENT_PACKAGES_DIR INSTDIR)
set(DLL_OPTION "")
if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
set(DLL_OPTION DLL=Y)
endif()
vcpkg_build_nmake(
SOURCE_PATH "${SOURCE_PATH}/wincon"
PROJECT_NAME Makefile.vc
ENABLE_INSTALL
OPTIONS
/A
"PDCURSES_SRCDIR=${PDCURSES_SRCDIR}"
WIDE=Y
UTF8=Y
${DLL_OPTION}
OPTIONS_RELEASE
"INSTDIR=${INSTDIR}"
"CFLAGS=-D_CRT_SECURE_NO_WARNINGS"
"LDFLAGS="
OPTIONS_DEBUG
"INSTDIR=${INSTDIR}\\debug"
"CFLAGS=-D_CRT_SECURE_NO_WARNINGS -DPDCDEBUG"
"LDFLAGS=-debug"
DEBUG=Y
SKIP_HEADERS=Y
)
vcpkg_copy_pdbs()
if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/curses.h" "#ifdef PDC_DLL_BUILD" "#if 1")
endif()
endif()

message(STATUS "Build ${TARGET_TRIPLET}-dbg")
vcpkg_execute_required_process(
COMMAND ${PDC_NMAKE_CMD} DEBUG=Y
WORKING_DIRECTORY ${PDC_NMAKE_CWD}
LOGNAME build-${TARGET_TRIPLET}-dbg
)
message(STATUS "Build ${TARGET_TRIPLET}-dbg done")

file (
INSTALL ${PDC_PDCLIB}.lib
DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib
)
if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
file (
INSTALL ${PDC_PDCLIB}.dll
DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin
)
endif()

file(
INSTALL ${SOURCE_PATH}/curses.h ${SOURCE_PATH}/panel.h
DESTINATION ${CURRENT_PACKAGES_DIR}/include
)

if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
file(READ ${CURRENT_PACKAGES_DIR}/include/curses.h _contents)
string(REPLACE "#ifdef PDC_DLL_BUILD" "#if 1" _contents "${_contents}")
file(WRITE ${CURRENT_PACKAGES_DIR}/include/curses.h "${_contents}")
endif()

file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/pdcurses RENAME copyright)

vcpkg_copy_pdbs()
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
5 changes: 3 additions & 2 deletions ports/pdcurses/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"name": "pdcurses",
"version-string": "3.9",
"port-version": 2,
"port-version": 3,
"description": "Public Domain Curses - a curses library for environments that don't fit the termcap/terminfo model.",
"homepage": "https://pdcurses.org/"
"homepage": "https://pdcurses.org/",
"supports": "windows & !uwp & !mingw"
}
6 changes: 0 additions & 6 deletions scripts/ci.baseline.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1120,12 +1120,6 @@ pdal:x64-linux=fail
pdal:x64-osx=fail
pdal-c:x64-windows-static=fail
pdal-c:x64-windows-static-md=fail
pdcurses:arm-uwp=fail
pdcurses:x64-linux=fail
pdcurses:x64-osx=fail
pdcurses:x64-uwp=fail
pdcurses:x64-windows-static=fail
pdcurses:x64-windows-static-md=fail
pfring:arm64-windows=fail
pfring:arm-uwp=fail
pfring:x64-uwp=fail
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -5210,7 +5210,7 @@
},
"pdcurses": {
"baseline": "3.9",
"port-version": 2
"port-version": 3
},
"pdqsort": {
"baseline": "2019-07-30",
Expand Down
5 changes: 5 additions & 0 deletions versions/p-/pdcurses.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "209926d000b4cc48ccbaab7717969d3b1671693b",
"version-string": "3.9",
"port-version": 3
},
{
"git-tree": "190eafb5554bf1f484edff1aa94598bac3ff9830",
"version-string": "3.9",
Expand Down