Skip to content

Commit

Permalink
synchronized texlive 73799.
Browse files Browse the repository at this point in the history
  • Loading branch information
clerkma committed Feb 9, 2025
1 parent 5fa8b4a commit deebaa7
Show file tree
Hide file tree
Showing 1,106 changed files with 231,887 additions and 36,644 deletions.
10 changes: 5 additions & 5 deletions texlive/texk/kpathsea/texmf.cnf
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
% If you modify this original file, YOUR CHANGES WILL BE LOST when it is
% updated. Instead, put your changes -- and only your changes, not an
% entire copy! -- in ../../texmf.cnf. That is, if this file is
% installed in /some/path/to/texlive/2024/texmf-dist/web2c/texmf.cnf,
% put your custom settings in /some/path/to/texlive/2024/texmf.cnf.
% installed in /some/path/to/texlive/2025/texmf-dist/web2c/texmf.cnf,
% put your custom settings in /some/path/to/texlive/2025/texmf.cnf.
% (Below, we use YYYY in place of the specific year.)
%
% What follows is a super-summary of what this .cnf file can
Expand Down Expand Up @@ -87,10 +87,10 @@ TEXMFSYSCONFIG = $TEXMFROOT/texmf-config
TEXMFHOME = ~/texmf
% TEXMFVAR, where texconfig/updmap/fmtutil store cached runtime data.
TEXMFVAR = ~/.texlive2024/texmf-var
TEXMFVAR = ~/.texlive2025/texmf-var
% TEXMFCONFIG, where texconfig/updmap/fmtutil store configuration data.
TEXMFCONFIG = ~/.texlive2024/texmf-config
TEXMFCONFIG = ~/.texlive2025/texmf-config
% This is the value manipulated by tlmgr's auxtrees subcommand in the
% root texmf.cnf. Kpathsea warns about a literally empty string for a
Expand Down Expand Up @@ -943,7 +943,7 @@ guess_input_kanji_encoding.mendex = 1
% in a texmf.cnf prefered, for example $TEXMFLOCAL/web2c/texmf.cnf.
command_line_encoding = utf-8
% From TeX Live 2024, the engine for ptex, eptex, platex, and
% As of TeX Live 2024, the engine for ptex, eptex, platex, and
% platex-dev is euptex. Therefore the function should be switched off
% for ptex, eptex, platex and platex-dev.
command_line_encoding.ptex = none
Expand Down
4 changes: 2 additions & 2 deletions texlive/utils/README
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
$Id: README 70500 2024-03-08 16:00:52Z karl $
$Id: README 73772 2025-02-08 17:23:03Z karl $
Public domain. Originally written 2005 by Karl Berry.

Extra utilities we (optionally) compile for TeX Live.
See comments in ../texk/README.

asymptote 2.88 - checked 8mar24
asymptote 2.96 - checked 8feb25
update to TL from CTAN, to include prebuilt doc.
see https://tug.org/texlive/build.html#asymptote
and tlpkg/bin/tl-update-asy
Expand Down
104 changes: 104 additions & 0 deletions texlive/utils/asymptote/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
cmake_minimum_required(VERSION 3.27)

include(cmake-scripts/common.cmake)
include(asy-pkg-version-suffix.cmake OPTIONAL RESULT_VARIABLE ASY_ADDR_VERSION_SUFFIX_FILE)
include(cmake-scripts/options.cmake)
include(pkg-info.cmake)
include(cmake-scripts/vcpkg-features.cmake)

project(${ASY_PACKAGE_NAME})

include(cmake-scripts/compiler-config.cmake)
include(cmake-scripts/basic-parameters.cmake)
include(cmake-scripts/buildfiles-to-src.cmake)
include(cmake-scripts/asy-files.cmake)

# setting build files
if (WIN32)
include(cmake-scripts/win32-specific.cmake)
endif()

build_files_to_src(CORE_BUILD_FILES CORE_SOURCE_FILES)
include(cmake-scripts/subrepo-projects.cmake)
include(cmake-scripts/external-libs.cmake)
include(cmake-scripts/thirdparty-impl.cmake)
include(cmake-scripts/backport-libs.cmake)

# PRC
add_subdirectory(prc/)
list(APPEND ASY_STATIC_LIBARIES PRC)

get_target_property(prc_incl_dir PRC INCLUDE_DIRECTORIES)
list(APPEND ASYMPTOTE_INCLUDES $<TARGET_PROPERTY:PRC,INCLUDE_DIRECTORIES>)

include(cmake-scripts/gnu-install-macros.cmake)
include(cmake-scripts/asy-macro.cmake)

include(cmake-scripts/generated-files.cmake)

# asy-reflect
if (ENABLE_CUDA_ASY_REFLECT)
message(STATUS "asy reflect target enabled")
add_subdirectory(cudareflect/)
endif()

# defining asy target

add_library(
asycore STATIC
${CORE_SOURCE_FILES}
${ASY_GENERATED_BUILD_SOURCES}
)

target_include_directories(asycore PUBLIC ${ASYMPTOTE_INCLUDES})
add_dependencies(asycore asy_gen_headers)
target_link_libraries(asycore PUBLIC ${ASY_STATIC_LIBARIES})
target_compile_definitions(asycore PUBLIC ${ASY_MACROS})
target_compile_options(asycore PUBLIC ${ASY_COMPILE_OPTS})

# asy executable

add_executable(
asy ${ASY_SRC_DIR}/main.cc ${ASY_WIN_RC_FILE}
)

target_link_libraries(asy PUBLIC asycore)

# base files
include(cmake-scripts/asy-base-files.cmake)

# asy + base files
add_custom_target(asy-basefiles DEPENDS ${ASY_OUTPUT_BASE_FILES})
add_custom_target(asy-with-basefiles ALL DEPENDS asy asy-basefiles)

# asy misc files
if (ENABLE_MISCFILES_GEN)
include(cmake-scripts/asy-misc-files.cmake)
endif()

# documentation generation

if (ENABLE_DOCGEN)
include(cmake-scripts/docgen.cmake)
endif()

# testing

enable_testing()
include(cmake-scripts/tests-asy.cmake)
include(cmake-scripts/tests-wce.cmake)

if (ENABLE_ASY_CXXTEST)
add_subdirectory(cxxtests)
endif()

# installation
if (WIN32)
# on windows, pre-NSIS
include(cmake-scripts/win32-pre-nsis-installer.cmake)
else()
# on unix systems
if (NOT CTAN_BUILD)
include(cmake-scripts/linux-install.cmake)
endif()
endif()
115 changes: 115 additions & 0 deletions texlive/utils/asymptote/CMakePresets.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
{
"version": 6,
"cmakeMinimumRequired": {
"major": 3,
"minor": 27,
"patch": 0
},
"include": [
"cmake-preset-files/base-presets.json"
],
"configurePresets": [
{
"name": "linux/release",
"displayName": "[linux-x86/64] Release",
"binaryDir": "${sourceDir}/cmake-build-linux/release",
"inherits": [
"base/linux-only",
"base/buildBaseWithVcpkg",
"base/release",
"base/allow_version_override_from_env"
]
},
{
"name": "linux/release/ci/with-ccache",
"binaryDir": "${sourceDir}/cmake-build-linux/release",
"inherits": [
"linux/release",
"base/linuxCcache"
]
},
{
"name": "linux/release/ci/with-ccache/compact-zero",
"binaryDir": "${sourceDir}/cmake-build-linux/release-compact-zero",
"inherits": [
"linux/release/ci/with-ccache",
"base/compact-zero-mode"
]
},
{
"name": "msvc/release",
"displayName": "[MSVC-x86/64] Release",
"binaryDir": "${sourceDir}/cmake-build-msvc/release",
"inherits": [
"base/buildBaseWithVcpkg",
"base/release",
"base/gccCompatCacheVar",
"base/windows-only",
"base/ensure-cl-compiler",
"base/allow_version_override_from_env"
],
"cacheVariables": {
"CMAKE_INSTALL_PREFIX": "${sourceDir}/cmake-install-w32-nsis-release"
}
},
{
"name": "msvc/release/ci/with-external-asymptote-pdf",
"inherits": [
"msvc/release"
],
"cacheVariables": {
"ENABLE_ASYMPTOTE_PDF_DOCGEN": "false",
"EXTERNAL_DOCUMENTATION_DIR": "${sourceDir}/asydoc"
}
},
{
"name": "msvc/release/with-external-doc-files",
"inherits": [
"msvc/release/ci/with-external-asymptote-pdf"
],
"cacheVariables": {
"ENABLE_DOCGEN": "false",
"ENABLE_MISCFILES_GEN": "false"
}
},
{
"name": "msvc/release/with-external-doc-files/with-ctan",
"inherits": [
"msvc/release/with-external-doc-files",
"base/ctan"
]
}
],
"buildPresets": [
{
"name": "msvc/release",
"displayName": "[MSVC-x86/64] Release",
"inherits": [
"build-base/windows-only"
],
"configurePreset": "msvc/release"
},
{
"name": "linux/release",
"displayName": "[linux-x86/64] Release",
"configurePreset": "linux/release",
"inherits": [
"build-base/linux-only"
]
},
{
"name": "linux/release/ci/with-ccache",
"configurePreset": "linux/release/ci/with-ccache",
"inherits": [
"build-base/linux-only"
]
},
{
"name": "linux/release/ci/with-ccache/compact-zero",
"configurePreset": "linux/release/ci/with-ccache/compact-zero",
"inherits": [
"build-base/linux-only"
]
}
]
}
Loading

0 comments on commit deebaa7

Please sign in to comment.