From 92a0ca79383642a340a731f075333f489cb71cd7 Mon Sep 17 00:00:00 2001 From: Jade Abraham Date: Tue, 18 Mar 2025 11:31:57 -0600 Subject: [PATCH 1/9] add helpers to chpl_home_utils Signed-off-by: Jade Abraham --- util/chplenv/chpl_home_utils.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/util/chplenv/chpl_home_utils.py b/util/chplenv/chpl_home_utils.py index f39199f8662f..849c13e60d22 100644 --- a/util/chplenv/chpl_home_utils.py +++ b/util/chplenv/chpl_home_utils.py @@ -229,6 +229,10 @@ def _main(): dest='func', const=using_chapel_module) parser.add_option('--configured-install-lib-prefix', action='store_const', dest='func', const=get_chpl_configured_install_lib_prefix) + parser.add_option('--runtime-lib', action='store_const', + dest='func', const=get_chpl_runtime_lib) + parser.add_option('--runtime-incl', action='store_const', + dest='func', const=get_chpl_runtime_incl) (options, args) = parser.parse_args() if options.func: From acc416ec77f833441804b362800fed9f12087508 Mon Sep 17 00:00:00 2001 From: Jade Abraham Date: Tue, 18 Mar 2025 11:32:29 -0600 Subject: [PATCH 2/9] add install steps for `util/cmake` to `lib` Signed-off-by: Jade Abraham --- Makefile | 5 +++++ compiler/Makefile | 14 ++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/Makefile b/Makefile index 94f04f2e6089..1ff4136d9f54 100644 --- a/Makefile +++ b/Makefile @@ -69,6 +69,7 @@ comprt: FORCE @$(MAKE) always-build-cls @$(MAKE) runtime @$(MAKE) modules + @$(MAKE) chpl-cmake-module-files notcompiler: FORCE @$(MAKE) third-party-try-opt @@ -205,6 +206,10 @@ chpl-language-server: frontend-shared FORCE @# building it twice). cd tools/chpl-language-server && $(MAKE) all install +chpl-cmake-module-files: FORCE + @echo "Generating CMake module files..." + @cd compiler && $(MAKE) chpl-cmake-module-files + lint-standard-modules: chplcheck FORCE tools/chplcheck/chplcheck --skip-unstable \ --internal-prefix "_" \ diff --git a/compiler/Makefile b/compiler/Makefile index 1c40766742e6..7af1df67bc5b 100644 --- a/compiler/Makefile +++ b/compiler/Makefile @@ -65,12 +65,15 @@ clean-cmakecache: FORCE cleanall: $(CLEANALLSUBDIRS) echocompilerdir rm -rf $(CLEANALL_TARGS) + @$(MAKE) clean-chpl-cmake-module-files cleandeps: $(CLEANSUBDIRDEPS) echocompilerdir rm -f $(DEPENDS) + @$(MAKE) clean-chpl-cmake-module-files clobber: $(CLOBBERSUBDIRS) echocompilerdir rm -rf ./$(CLOBBER_TARGS) + @$(MAKE) clean-chpl-cmake-module-files # @@ -95,6 +98,7 @@ $(CHPL_CONFIG_CHECK): | $(CHPL_BIN_DIR) COMPILER_LIB_DIR = $(CHPL_MAKE_HOME)/lib/compiler/$(CHPL_MAKE_HOST_BIN_SUBDIR) +CMAKE_LIB_DIR = $(CHPL_MAKE_HOME)/lib/cmake/chpl CMAKE_FLAGS = -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=$(CHPL_BIN_DIR) -DCMAKE_LIBRARY_OUTPUT_DIRECTORY=$(COMPILER_LIB_DIR) -DCHPL_CXX_FLAGS="$(COMP_CXXFLAGS)" -DCHPL_LD_FLAGS="$(LDFLAGS)" @@ -150,6 +154,7 @@ clean: FORCE $(CLEANSUBDIRS) echocompilerdir fi rm -f $(CLEAN_TARGS) @$(MAKE) clean-cmakecache + @$(MAKE) clean-chpl-cmake-module-files # used in test-frontend to make sure cmake is configured with assertions on CMAKE_FLAGS_NO_NDEBUG=$(subst -DNDEBUG,,$(CMAKE_FLAGS)) @@ -214,12 +219,21 @@ chpldoc: FORCE $(CHPLDOC) MAKEALLCHPLDEFSUBDIRS = $(CHPLDEF_SUBDIRS:%=%.makedir) +chpl-cmake-module-files: FORCE $(CMAKE_LIB_DIR) + cp $(CHPL_MAKE_HOME)/util/cmake/*.cmake $(CHPL_MAKE_HOME)/util/cmake/*.cmake.in $(CMAKE_LIB_DIR) + +clean-chpl-cmake-module-files: FORCE + rm -rf $(CMAKE_LIB_DIR) + $(COMPILER_BUILD): mkdir -p $@ $(CHPL_BIN_DIR): mkdir -p $@ +$(CMAKE_LIB_DIR): + mkdir -p $@ + install-chpl-chpldoc: FORCE $(CHPL_CONFIG_CHECK) # this target is called by the install.sh script which is called by a `make install` # from the top-level directory. From 6ba1fdef28e5ae289b77b84aed5391e77c7da94a Mon Sep 17 00:00:00 2001 From: Jade Abraham Date: Tue, 18 Mar 2025 11:32:38 -0600 Subject: [PATCH 3/9] update homebrew Signed-off-by: Jade Abraham --- util/packaging/homebrew/chapel-main.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/util/packaging/homebrew/chapel-main.rb b/util/packaging/homebrew/chapel-main.rb index abd41cfd6881..ee439e21d510 100644 --- a/util/packaging/homebrew/chapel-main.rb +++ b/util/packaging/homebrew/chapel-main.rb @@ -92,6 +92,7 @@ def install bin.install libexec.glob("bin/#{platform}/*") bin.env_script_all_files libexec/"bin"/platform, CHPL_HOME: libexec man1.install_symlink libexec.glob("man/man1/*.1") + (lib/"cmake/chpl").install libexec.glob("lib/cmake/chpl/*") end test do From 8b0da32ce6d0b916a064873036b6e21ee3b21c8e Mon Sep 17 00:00:00 2001 From: Jade Abraham Date: Tue, 18 Mar 2025 11:36:04 -0600 Subject: [PATCH 4/9] update apt install Signed-off-by: Jade Abraham --- util/packaging/apt/common/copy_files.py | 1 + 1 file changed, 1 insertion(+) diff --git a/util/packaging/apt/common/copy_files.py b/util/packaging/apt/common/copy_files.py index bcd78948161f..638ae0a2b212 100644 --- a/util/packaging/apt/common/copy_files.py +++ b/util/packaging/apt/common/copy_files.py @@ -14,6 +14,7 @@ ] dirs = [ "/usr/lib/chapel", + "/usr/lib/cmake/chpl", "/usr/share/chapel", ] for f in files: From 9fff6a772d1447b8333db731fdb4a573db8413e2 Mon Sep 17 00:00:00 2001 From: Jade Abraham Date: Tue, 18 Mar 2025 11:36:15 -0600 Subject: [PATCH 5/9] update rpm builds Signed-off-by: Jade Abraham --- util/packaging/rpm/amzn2023-gasnet-udp/spec.template | 2 ++ util/packaging/rpm/amzn2023-ofi-slurm/spec.template | 2 ++ util/packaging/rpm/amzn2023/spec.template | 2 ++ util/packaging/rpm/el9-gasnet-udp/spec.template | 2 ++ util/packaging/rpm/el9-ofi-slurm/spec.template | 2 ++ util/packaging/rpm/el9/spec.template | 2 ++ util/packaging/rpm/fc40-gasnet-udp/spec.template | 2 ++ util/packaging/rpm/fc40/spec.template | 2 ++ util/packaging/rpm/fc41-gasnet-udp/spec.template | 2 ++ util/packaging/rpm/fc41/spec.template | 2 ++ 10 files changed, 20 insertions(+) diff --git a/util/packaging/rpm/amzn2023-gasnet-udp/spec.template b/util/packaging/rpm/amzn2023-gasnet-udp/spec.template index 3f490cf8a1c8..fc4a53c5728e 100644 --- a/util/packaging/rpm/amzn2023-gasnet-udp/spec.template +++ b/util/packaging/rpm/amzn2023-gasnet-udp/spec.template @@ -25,6 +25,7 @@ mkdir -p %{buildroot}/%{_prefix} mkdir -p %{buildroot}/%{_prefix}/bin mkdir -p %{buildroot}/%{_prefix}/lib mkdir -p %{buildroot}/%{_prefix}/share +mkdir -p %{buildroot}/%{_prefix}/lib/cmake/chpl # Binaries cp %{_prefix}/bin/chpl %{buildroot}/%{_prefix}/bin/chpl @@ -34,6 +35,7 @@ cp %{_prefix}/bin/chplcheck %{buildroot}/%{_prefix}/bin/chplcheck cp %{_prefix}/bin/chpl-language-server %{buildroot}/%{_prefix}/bin/chpl-language-server # Libraries cp -r %{_prefix}/lib/chapel %{buildroot}/%{_prefix}/lib/chapel +cp -r %{_prefix}/lib/cmake/chpl %{buildroot}/%{_prefix}/lib/cmake/chpl # CHPL_HOME cp -r %{_prefix}/share/chapel %{buildroot}/%{_prefix}/share/chapel diff --git a/util/packaging/rpm/amzn2023-ofi-slurm/spec.template b/util/packaging/rpm/amzn2023-ofi-slurm/spec.template index e53e1ccbb542..129fe09b2229 100644 --- a/util/packaging/rpm/amzn2023-ofi-slurm/spec.template +++ b/util/packaging/rpm/amzn2023-ofi-slurm/spec.template @@ -25,6 +25,7 @@ mkdir -p %{buildroot}/%{_prefix} mkdir -p %{buildroot}/%{_prefix}/bin mkdir -p %{buildroot}/%{_prefix}/lib mkdir -p %{buildroot}/%{_prefix}/share +mkdir -p %{buildroot}/%{_prefix}/lib/cmake/chpl # Binaries cp %{_prefix}/bin/chpl %{buildroot}/%{_prefix}/bin/chpl @@ -34,6 +35,7 @@ cp %{_prefix}/bin/chplcheck %{buildroot}/%{_prefix}/bin/chplcheck cp %{_prefix}/bin/chpl-language-server %{buildroot}/%{_prefix}/bin/chpl-language-server # Libraries cp -r %{_prefix}/lib/chapel %{buildroot}/%{_prefix}/lib/chapel +cp -r %{_prefix}/lib/cmake/chpl %{buildroot}/%{_prefix}/lib/cmake/chpl # CHPL_HOME cp -r %{_prefix}/share/chapel %{buildroot}/%{_prefix}/share/chapel diff --git a/util/packaging/rpm/amzn2023/spec.template b/util/packaging/rpm/amzn2023/spec.template index 3f490cf8a1c8..fc4a53c5728e 100644 --- a/util/packaging/rpm/amzn2023/spec.template +++ b/util/packaging/rpm/amzn2023/spec.template @@ -25,6 +25,7 @@ mkdir -p %{buildroot}/%{_prefix} mkdir -p %{buildroot}/%{_prefix}/bin mkdir -p %{buildroot}/%{_prefix}/lib mkdir -p %{buildroot}/%{_prefix}/share +mkdir -p %{buildroot}/%{_prefix}/lib/cmake/chpl # Binaries cp %{_prefix}/bin/chpl %{buildroot}/%{_prefix}/bin/chpl @@ -34,6 +35,7 @@ cp %{_prefix}/bin/chplcheck %{buildroot}/%{_prefix}/bin/chplcheck cp %{_prefix}/bin/chpl-language-server %{buildroot}/%{_prefix}/bin/chpl-language-server # Libraries cp -r %{_prefix}/lib/chapel %{buildroot}/%{_prefix}/lib/chapel +cp -r %{_prefix}/lib/cmake/chpl %{buildroot}/%{_prefix}/lib/cmake/chpl # CHPL_HOME cp -r %{_prefix}/share/chapel %{buildroot}/%{_prefix}/share/chapel diff --git a/util/packaging/rpm/el9-gasnet-udp/spec.template b/util/packaging/rpm/el9-gasnet-udp/spec.template index 3f490cf8a1c8..fc4a53c5728e 100644 --- a/util/packaging/rpm/el9-gasnet-udp/spec.template +++ b/util/packaging/rpm/el9-gasnet-udp/spec.template @@ -25,6 +25,7 @@ mkdir -p %{buildroot}/%{_prefix} mkdir -p %{buildroot}/%{_prefix}/bin mkdir -p %{buildroot}/%{_prefix}/lib mkdir -p %{buildroot}/%{_prefix}/share +mkdir -p %{buildroot}/%{_prefix}/lib/cmake/chpl # Binaries cp %{_prefix}/bin/chpl %{buildroot}/%{_prefix}/bin/chpl @@ -34,6 +35,7 @@ cp %{_prefix}/bin/chplcheck %{buildroot}/%{_prefix}/bin/chplcheck cp %{_prefix}/bin/chpl-language-server %{buildroot}/%{_prefix}/bin/chpl-language-server # Libraries cp -r %{_prefix}/lib/chapel %{buildroot}/%{_prefix}/lib/chapel +cp -r %{_prefix}/lib/cmake/chpl %{buildroot}/%{_prefix}/lib/cmake/chpl # CHPL_HOME cp -r %{_prefix}/share/chapel %{buildroot}/%{_prefix}/share/chapel diff --git a/util/packaging/rpm/el9-ofi-slurm/spec.template b/util/packaging/rpm/el9-ofi-slurm/spec.template index e53e1ccbb542..129fe09b2229 100644 --- a/util/packaging/rpm/el9-ofi-slurm/spec.template +++ b/util/packaging/rpm/el9-ofi-slurm/spec.template @@ -25,6 +25,7 @@ mkdir -p %{buildroot}/%{_prefix} mkdir -p %{buildroot}/%{_prefix}/bin mkdir -p %{buildroot}/%{_prefix}/lib mkdir -p %{buildroot}/%{_prefix}/share +mkdir -p %{buildroot}/%{_prefix}/lib/cmake/chpl # Binaries cp %{_prefix}/bin/chpl %{buildroot}/%{_prefix}/bin/chpl @@ -34,6 +35,7 @@ cp %{_prefix}/bin/chplcheck %{buildroot}/%{_prefix}/bin/chplcheck cp %{_prefix}/bin/chpl-language-server %{buildroot}/%{_prefix}/bin/chpl-language-server # Libraries cp -r %{_prefix}/lib/chapel %{buildroot}/%{_prefix}/lib/chapel +cp -r %{_prefix}/lib/cmake/chpl %{buildroot}/%{_prefix}/lib/cmake/chpl # CHPL_HOME cp -r %{_prefix}/share/chapel %{buildroot}/%{_prefix}/share/chapel diff --git a/util/packaging/rpm/el9/spec.template b/util/packaging/rpm/el9/spec.template index 3f490cf8a1c8..fc4a53c5728e 100644 --- a/util/packaging/rpm/el9/spec.template +++ b/util/packaging/rpm/el9/spec.template @@ -25,6 +25,7 @@ mkdir -p %{buildroot}/%{_prefix} mkdir -p %{buildroot}/%{_prefix}/bin mkdir -p %{buildroot}/%{_prefix}/lib mkdir -p %{buildroot}/%{_prefix}/share +mkdir -p %{buildroot}/%{_prefix}/lib/cmake/chpl # Binaries cp %{_prefix}/bin/chpl %{buildroot}/%{_prefix}/bin/chpl @@ -34,6 +35,7 @@ cp %{_prefix}/bin/chplcheck %{buildroot}/%{_prefix}/bin/chplcheck cp %{_prefix}/bin/chpl-language-server %{buildroot}/%{_prefix}/bin/chpl-language-server # Libraries cp -r %{_prefix}/lib/chapel %{buildroot}/%{_prefix}/lib/chapel +cp -r %{_prefix}/lib/cmake/chpl %{buildroot}/%{_prefix}/lib/cmake/chpl # CHPL_HOME cp -r %{_prefix}/share/chapel %{buildroot}/%{_prefix}/share/chapel diff --git a/util/packaging/rpm/fc40-gasnet-udp/spec.template b/util/packaging/rpm/fc40-gasnet-udp/spec.template index 3f490cf8a1c8..fc4a53c5728e 100644 --- a/util/packaging/rpm/fc40-gasnet-udp/spec.template +++ b/util/packaging/rpm/fc40-gasnet-udp/spec.template @@ -25,6 +25,7 @@ mkdir -p %{buildroot}/%{_prefix} mkdir -p %{buildroot}/%{_prefix}/bin mkdir -p %{buildroot}/%{_prefix}/lib mkdir -p %{buildroot}/%{_prefix}/share +mkdir -p %{buildroot}/%{_prefix}/lib/cmake/chpl # Binaries cp %{_prefix}/bin/chpl %{buildroot}/%{_prefix}/bin/chpl @@ -34,6 +35,7 @@ cp %{_prefix}/bin/chplcheck %{buildroot}/%{_prefix}/bin/chplcheck cp %{_prefix}/bin/chpl-language-server %{buildroot}/%{_prefix}/bin/chpl-language-server # Libraries cp -r %{_prefix}/lib/chapel %{buildroot}/%{_prefix}/lib/chapel +cp -r %{_prefix}/lib/cmake/chpl %{buildroot}/%{_prefix}/lib/cmake/chpl # CHPL_HOME cp -r %{_prefix}/share/chapel %{buildroot}/%{_prefix}/share/chapel diff --git a/util/packaging/rpm/fc40/spec.template b/util/packaging/rpm/fc40/spec.template index 3f490cf8a1c8..fc4a53c5728e 100644 --- a/util/packaging/rpm/fc40/spec.template +++ b/util/packaging/rpm/fc40/spec.template @@ -25,6 +25,7 @@ mkdir -p %{buildroot}/%{_prefix} mkdir -p %{buildroot}/%{_prefix}/bin mkdir -p %{buildroot}/%{_prefix}/lib mkdir -p %{buildroot}/%{_prefix}/share +mkdir -p %{buildroot}/%{_prefix}/lib/cmake/chpl # Binaries cp %{_prefix}/bin/chpl %{buildroot}/%{_prefix}/bin/chpl @@ -34,6 +35,7 @@ cp %{_prefix}/bin/chplcheck %{buildroot}/%{_prefix}/bin/chplcheck cp %{_prefix}/bin/chpl-language-server %{buildroot}/%{_prefix}/bin/chpl-language-server # Libraries cp -r %{_prefix}/lib/chapel %{buildroot}/%{_prefix}/lib/chapel +cp -r %{_prefix}/lib/cmake/chpl %{buildroot}/%{_prefix}/lib/cmake/chpl # CHPL_HOME cp -r %{_prefix}/share/chapel %{buildroot}/%{_prefix}/share/chapel diff --git a/util/packaging/rpm/fc41-gasnet-udp/spec.template b/util/packaging/rpm/fc41-gasnet-udp/spec.template index 3f490cf8a1c8..fc4a53c5728e 100644 --- a/util/packaging/rpm/fc41-gasnet-udp/spec.template +++ b/util/packaging/rpm/fc41-gasnet-udp/spec.template @@ -25,6 +25,7 @@ mkdir -p %{buildroot}/%{_prefix} mkdir -p %{buildroot}/%{_prefix}/bin mkdir -p %{buildroot}/%{_prefix}/lib mkdir -p %{buildroot}/%{_prefix}/share +mkdir -p %{buildroot}/%{_prefix}/lib/cmake/chpl # Binaries cp %{_prefix}/bin/chpl %{buildroot}/%{_prefix}/bin/chpl @@ -34,6 +35,7 @@ cp %{_prefix}/bin/chplcheck %{buildroot}/%{_prefix}/bin/chplcheck cp %{_prefix}/bin/chpl-language-server %{buildroot}/%{_prefix}/bin/chpl-language-server # Libraries cp -r %{_prefix}/lib/chapel %{buildroot}/%{_prefix}/lib/chapel +cp -r %{_prefix}/lib/cmake/chpl %{buildroot}/%{_prefix}/lib/cmake/chpl # CHPL_HOME cp -r %{_prefix}/share/chapel %{buildroot}/%{_prefix}/share/chapel diff --git a/util/packaging/rpm/fc41/spec.template b/util/packaging/rpm/fc41/spec.template index 3f490cf8a1c8..fc4a53c5728e 100644 --- a/util/packaging/rpm/fc41/spec.template +++ b/util/packaging/rpm/fc41/spec.template @@ -25,6 +25,7 @@ mkdir -p %{buildroot}/%{_prefix} mkdir -p %{buildroot}/%{_prefix}/bin mkdir -p %{buildroot}/%{_prefix}/lib mkdir -p %{buildroot}/%{_prefix}/share +mkdir -p %{buildroot}/%{_prefix}/lib/cmake/chpl # Binaries cp %{_prefix}/bin/chpl %{buildroot}/%{_prefix}/bin/chpl @@ -34,6 +35,7 @@ cp %{_prefix}/bin/chplcheck %{buildroot}/%{_prefix}/bin/chplcheck cp %{_prefix}/bin/chpl-language-server %{buildroot}/%{_prefix}/bin/chpl-language-server # Libraries cp -r %{_prefix}/lib/chapel %{buildroot}/%{_prefix}/lib/chapel +cp -r %{_prefix}/lib/cmake/chpl %{buildroot}/%{_prefix}/lib/cmake/chpl # CHPL_HOME cp -r %{_prefix}/share/chapel %{buildroot}/%{_prefix}/share/chapel From 3f2bd2c391a748bea0bcb1ef5b0894214f893fee Mon Sep 17 00:00:00 2001 From: Jade Abraham Date: Tue, 18 Mar 2025 11:51:42 -0600 Subject: [PATCH 6/9] update install script Signed-off-by: Jade Abraham --- util/buildRelease/install.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/util/buildRelease/install.sh b/util/buildRelease/install.sh index abc69dde517d..098dbe3057bc 100755 --- a/util/buildRelease/install.sh +++ b/util/buildRelease/install.sh @@ -127,6 +127,7 @@ then DEST_RUNTIME_LIB="$PREFIX/lib/chapel/$VERS/runtime/lib" DEST_RUNTIME_INCL="$PREFIX/lib/chapel/$VERS/runtime/include" DEST_THIRD_PARTY="$PREFIX/lib/chapel/$VERS/third-party" + DEST_CMAKE_LIB="$PREFIX/lib/cmake/chpl" DEST_CHPL_HOME="$PREFIX/share/chapel/$VERS" echo "Installing Chapel split to bin, lib, share to $PREFIX" if [ "$CHPL_HOME" = "$PREFIX" ] @@ -140,6 +141,7 @@ else DEST_RUNTIME_LIB="$DEST_DIR/lib" DEST_RUNTIME_INCL="$DEST_DIR/runtime/include" DEST_THIRD_PARTY="$DEST_DIR/third-party" + DEST_CMAKE_LIB="$DEST_DIR/lib/cmake/chpl" DEST_CHPL_HOME="$DEST_DIR" echo "Installing Chapel-as-a-directory to $DEST_DIR" if [ "$CHPL_HOME" = "$DEST_DIR" ] @@ -246,6 +248,8 @@ myinstallfileto () { # copy compiler and runtime lib myinstalldir lib "$DEST_RUNTIME_LIB" +# copy cmake files to the cmake lib directory +myinstalldir lib/cmake/chpl "$DEST_CMAKE_LIB" # copy runtime include myinstalldir runtime/include "$DEST_RUNTIME_INCL" From fe413519211c91ac0f707f889f57b07c9d64ce5f Mon Sep 17 00:00:00 2001 From: Jade Abraham Date: Mon, 14 Apr 2025 10:45:51 -0700 Subject: [PATCH 7/9] only remove cmake files on clobber Signed-off-by: Jade Abraham --- compiler/Makefile | 3 --- 1 file changed, 3 deletions(-) diff --git a/compiler/Makefile b/compiler/Makefile index 7af1df67bc5b..d814f1cfb440 100644 --- a/compiler/Makefile +++ b/compiler/Makefile @@ -65,11 +65,9 @@ clean-cmakecache: FORCE cleanall: $(CLEANALLSUBDIRS) echocompilerdir rm -rf $(CLEANALL_TARGS) - @$(MAKE) clean-chpl-cmake-module-files cleandeps: $(CLEANSUBDIRDEPS) echocompilerdir rm -f $(DEPENDS) - @$(MAKE) clean-chpl-cmake-module-files clobber: $(CLOBBERSUBDIRS) echocompilerdir rm -rf ./$(CLOBBER_TARGS) @@ -154,7 +152,6 @@ clean: FORCE $(CLEANSUBDIRS) echocompilerdir fi rm -f $(CLEAN_TARGS) @$(MAKE) clean-cmakecache - @$(MAKE) clean-chpl-cmake-module-files # used in test-frontend to make sure cmake is configured with assertions on CMAKE_FLAGS_NO_NDEBUG=$(subst -DNDEBUG,,$(CMAKE_FLAGS)) From ff3e1f02a3237d0e399c1d0ed47b24fa96533057 Mon Sep 17 00:00:00 2001 From: Jade Abraham Date: Mon, 14 Apr 2025 14:23:28 -0700 Subject: [PATCH 8/9] fix rpm specs Signed-off-by: Jade Abraham --- util/packaging/rpm/amzn2023-gasnet-udp/spec.template | 3 ++- util/packaging/rpm/amzn2023-ofi-slurm/spec.template | 3 ++- util/packaging/rpm/amzn2023/spec.template | 3 ++- util/packaging/rpm/el9-gasnet-udp/spec.template | 3 ++- util/packaging/rpm/el9-ofi-slurm/spec.template | 3 ++- util/packaging/rpm/el9/spec.template | 3 ++- util/packaging/rpm/fc40-gasnet-udp/spec.template | 3 ++- util/packaging/rpm/fc40/spec.template | 3 ++- util/packaging/rpm/fc41-gasnet-udp/spec.template | 3 ++- util/packaging/rpm/fc41/spec.template | 4 +++- 10 files changed, 21 insertions(+), 10 deletions(-) diff --git a/util/packaging/rpm/amzn2023-gasnet-udp/spec.template b/util/packaging/rpm/amzn2023-gasnet-udp/spec.template index fc4a53c5728e..cdc778d49bc0 100644 --- a/util/packaging/rpm/amzn2023-gasnet-udp/spec.template +++ b/util/packaging/rpm/amzn2023-gasnet-udp/spec.template @@ -35,7 +35,7 @@ cp %{_prefix}/bin/chplcheck %{buildroot}/%{_prefix}/bin/chplcheck cp %{_prefix}/bin/chpl-language-server %{buildroot}/%{_prefix}/bin/chpl-language-server # Libraries cp -r %{_prefix}/lib/chapel %{buildroot}/%{_prefix}/lib/chapel -cp -r %{_prefix}/lib/cmake/chpl %{buildroot}/%{_prefix}/lib/cmake/chpl +cp -r %{_prefix}/lib/cmake/chpl %{buildroot}/%{_prefix}/lib/cmake # CHPL_HOME cp -r %{_prefix}/share/chapel %{buildroot}/%{_prefix}/share/chapel @@ -47,5 +47,6 @@ cp -r %{_prefix}/share/chapel %{buildroot}/%{_prefix}/share/chapel %{_prefix}/bin/chpl-language-server %{_prefix}/lib/chapel/* %{_prefix}/share/chapel/* +%{_prefix}/lib/cmake/chpl/* %changelog diff --git a/util/packaging/rpm/amzn2023-ofi-slurm/spec.template b/util/packaging/rpm/amzn2023-ofi-slurm/spec.template index 129fe09b2229..a2d1514d7d32 100644 --- a/util/packaging/rpm/amzn2023-ofi-slurm/spec.template +++ b/util/packaging/rpm/amzn2023-ofi-slurm/spec.template @@ -35,7 +35,7 @@ cp %{_prefix}/bin/chplcheck %{buildroot}/%{_prefix}/bin/chplcheck cp %{_prefix}/bin/chpl-language-server %{buildroot}/%{_prefix}/bin/chpl-language-server # Libraries cp -r %{_prefix}/lib/chapel %{buildroot}/%{_prefix}/lib/chapel -cp -r %{_prefix}/lib/cmake/chpl %{buildroot}/%{_prefix}/lib/cmake/chpl +cp -r %{_prefix}/lib/cmake/chpl %{buildroot}/%{_prefix}/lib/cmake # CHPL_HOME cp -r %{_prefix}/share/chapel %{buildroot}/%{_prefix}/share/chapel @@ -47,5 +47,6 @@ cp -r %{_prefix}/share/chapel %{buildroot}/%{_prefix}/share/chapel %{_prefix}/bin/chpl-language-server %{_prefix}/lib/chapel/* %{_prefix}/share/chapel/* +%{_prefix}/lib/cmake/chpl/* %changelog diff --git a/util/packaging/rpm/amzn2023/spec.template b/util/packaging/rpm/amzn2023/spec.template index fc4a53c5728e..cdc778d49bc0 100644 --- a/util/packaging/rpm/amzn2023/spec.template +++ b/util/packaging/rpm/amzn2023/spec.template @@ -35,7 +35,7 @@ cp %{_prefix}/bin/chplcheck %{buildroot}/%{_prefix}/bin/chplcheck cp %{_prefix}/bin/chpl-language-server %{buildroot}/%{_prefix}/bin/chpl-language-server # Libraries cp -r %{_prefix}/lib/chapel %{buildroot}/%{_prefix}/lib/chapel -cp -r %{_prefix}/lib/cmake/chpl %{buildroot}/%{_prefix}/lib/cmake/chpl +cp -r %{_prefix}/lib/cmake/chpl %{buildroot}/%{_prefix}/lib/cmake # CHPL_HOME cp -r %{_prefix}/share/chapel %{buildroot}/%{_prefix}/share/chapel @@ -47,5 +47,6 @@ cp -r %{_prefix}/share/chapel %{buildroot}/%{_prefix}/share/chapel %{_prefix}/bin/chpl-language-server %{_prefix}/lib/chapel/* %{_prefix}/share/chapel/* +%{_prefix}/lib/cmake/chpl/* %changelog diff --git a/util/packaging/rpm/el9-gasnet-udp/spec.template b/util/packaging/rpm/el9-gasnet-udp/spec.template index fc4a53c5728e..cdc778d49bc0 100644 --- a/util/packaging/rpm/el9-gasnet-udp/spec.template +++ b/util/packaging/rpm/el9-gasnet-udp/spec.template @@ -35,7 +35,7 @@ cp %{_prefix}/bin/chplcheck %{buildroot}/%{_prefix}/bin/chplcheck cp %{_prefix}/bin/chpl-language-server %{buildroot}/%{_prefix}/bin/chpl-language-server # Libraries cp -r %{_prefix}/lib/chapel %{buildroot}/%{_prefix}/lib/chapel -cp -r %{_prefix}/lib/cmake/chpl %{buildroot}/%{_prefix}/lib/cmake/chpl +cp -r %{_prefix}/lib/cmake/chpl %{buildroot}/%{_prefix}/lib/cmake # CHPL_HOME cp -r %{_prefix}/share/chapel %{buildroot}/%{_prefix}/share/chapel @@ -47,5 +47,6 @@ cp -r %{_prefix}/share/chapel %{buildroot}/%{_prefix}/share/chapel %{_prefix}/bin/chpl-language-server %{_prefix}/lib/chapel/* %{_prefix}/share/chapel/* +%{_prefix}/lib/cmake/chpl/* %changelog diff --git a/util/packaging/rpm/el9-ofi-slurm/spec.template b/util/packaging/rpm/el9-ofi-slurm/spec.template index 129fe09b2229..a2d1514d7d32 100644 --- a/util/packaging/rpm/el9-ofi-slurm/spec.template +++ b/util/packaging/rpm/el9-ofi-slurm/spec.template @@ -35,7 +35,7 @@ cp %{_prefix}/bin/chplcheck %{buildroot}/%{_prefix}/bin/chplcheck cp %{_prefix}/bin/chpl-language-server %{buildroot}/%{_prefix}/bin/chpl-language-server # Libraries cp -r %{_prefix}/lib/chapel %{buildroot}/%{_prefix}/lib/chapel -cp -r %{_prefix}/lib/cmake/chpl %{buildroot}/%{_prefix}/lib/cmake/chpl +cp -r %{_prefix}/lib/cmake/chpl %{buildroot}/%{_prefix}/lib/cmake # CHPL_HOME cp -r %{_prefix}/share/chapel %{buildroot}/%{_prefix}/share/chapel @@ -47,5 +47,6 @@ cp -r %{_prefix}/share/chapel %{buildroot}/%{_prefix}/share/chapel %{_prefix}/bin/chpl-language-server %{_prefix}/lib/chapel/* %{_prefix}/share/chapel/* +%{_prefix}/lib/cmake/chpl/* %changelog diff --git a/util/packaging/rpm/el9/spec.template b/util/packaging/rpm/el9/spec.template index fc4a53c5728e..cdc778d49bc0 100644 --- a/util/packaging/rpm/el9/spec.template +++ b/util/packaging/rpm/el9/spec.template @@ -35,7 +35,7 @@ cp %{_prefix}/bin/chplcheck %{buildroot}/%{_prefix}/bin/chplcheck cp %{_prefix}/bin/chpl-language-server %{buildroot}/%{_prefix}/bin/chpl-language-server # Libraries cp -r %{_prefix}/lib/chapel %{buildroot}/%{_prefix}/lib/chapel -cp -r %{_prefix}/lib/cmake/chpl %{buildroot}/%{_prefix}/lib/cmake/chpl +cp -r %{_prefix}/lib/cmake/chpl %{buildroot}/%{_prefix}/lib/cmake # CHPL_HOME cp -r %{_prefix}/share/chapel %{buildroot}/%{_prefix}/share/chapel @@ -47,5 +47,6 @@ cp -r %{_prefix}/share/chapel %{buildroot}/%{_prefix}/share/chapel %{_prefix}/bin/chpl-language-server %{_prefix}/lib/chapel/* %{_prefix}/share/chapel/* +%{_prefix}/lib/cmake/chpl/* %changelog diff --git a/util/packaging/rpm/fc40-gasnet-udp/spec.template b/util/packaging/rpm/fc40-gasnet-udp/spec.template index fc4a53c5728e..cdc778d49bc0 100644 --- a/util/packaging/rpm/fc40-gasnet-udp/spec.template +++ b/util/packaging/rpm/fc40-gasnet-udp/spec.template @@ -35,7 +35,7 @@ cp %{_prefix}/bin/chplcheck %{buildroot}/%{_prefix}/bin/chplcheck cp %{_prefix}/bin/chpl-language-server %{buildroot}/%{_prefix}/bin/chpl-language-server # Libraries cp -r %{_prefix}/lib/chapel %{buildroot}/%{_prefix}/lib/chapel -cp -r %{_prefix}/lib/cmake/chpl %{buildroot}/%{_prefix}/lib/cmake/chpl +cp -r %{_prefix}/lib/cmake/chpl %{buildroot}/%{_prefix}/lib/cmake # CHPL_HOME cp -r %{_prefix}/share/chapel %{buildroot}/%{_prefix}/share/chapel @@ -47,5 +47,6 @@ cp -r %{_prefix}/share/chapel %{buildroot}/%{_prefix}/share/chapel %{_prefix}/bin/chpl-language-server %{_prefix}/lib/chapel/* %{_prefix}/share/chapel/* +%{_prefix}/lib/cmake/chpl/* %changelog diff --git a/util/packaging/rpm/fc40/spec.template b/util/packaging/rpm/fc40/spec.template index fc4a53c5728e..cdc778d49bc0 100644 --- a/util/packaging/rpm/fc40/spec.template +++ b/util/packaging/rpm/fc40/spec.template @@ -35,7 +35,7 @@ cp %{_prefix}/bin/chplcheck %{buildroot}/%{_prefix}/bin/chplcheck cp %{_prefix}/bin/chpl-language-server %{buildroot}/%{_prefix}/bin/chpl-language-server # Libraries cp -r %{_prefix}/lib/chapel %{buildroot}/%{_prefix}/lib/chapel -cp -r %{_prefix}/lib/cmake/chpl %{buildroot}/%{_prefix}/lib/cmake/chpl +cp -r %{_prefix}/lib/cmake/chpl %{buildroot}/%{_prefix}/lib/cmake # CHPL_HOME cp -r %{_prefix}/share/chapel %{buildroot}/%{_prefix}/share/chapel @@ -47,5 +47,6 @@ cp -r %{_prefix}/share/chapel %{buildroot}/%{_prefix}/share/chapel %{_prefix}/bin/chpl-language-server %{_prefix}/lib/chapel/* %{_prefix}/share/chapel/* +%{_prefix}/lib/cmake/chpl/* %changelog diff --git a/util/packaging/rpm/fc41-gasnet-udp/spec.template b/util/packaging/rpm/fc41-gasnet-udp/spec.template index fc4a53c5728e..cdc778d49bc0 100644 --- a/util/packaging/rpm/fc41-gasnet-udp/spec.template +++ b/util/packaging/rpm/fc41-gasnet-udp/spec.template @@ -35,7 +35,7 @@ cp %{_prefix}/bin/chplcheck %{buildroot}/%{_prefix}/bin/chplcheck cp %{_prefix}/bin/chpl-language-server %{buildroot}/%{_prefix}/bin/chpl-language-server # Libraries cp -r %{_prefix}/lib/chapel %{buildroot}/%{_prefix}/lib/chapel -cp -r %{_prefix}/lib/cmake/chpl %{buildroot}/%{_prefix}/lib/cmake/chpl +cp -r %{_prefix}/lib/cmake/chpl %{buildroot}/%{_prefix}/lib/cmake # CHPL_HOME cp -r %{_prefix}/share/chapel %{buildroot}/%{_prefix}/share/chapel @@ -47,5 +47,6 @@ cp -r %{_prefix}/share/chapel %{buildroot}/%{_prefix}/share/chapel %{_prefix}/bin/chpl-language-server %{_prefix}/lib/chapel/* %{_prefix}/share/chapel/* +%{_prefix}/lib/cmake/chpl/* %changelog diff --git a/util/packaging/rpm/fc41/spec.template b/util/packaging/rpm/fc41/spec.template index fc4a53c5728e..a68eef7de8d1 100644 --- a/util/packaging/rpm/fc41/spec.template +++ b/util/packaging/rpm/fc41/spec.template @@ -35,7 +35,7 @@ cp %{_prefix}/bin/chplcheck %{buildroot}/%{_prefix}/bin/chplcheck cp %{_prefix}/bin/chpl-language-server %{buildroot}/%{_prefix}/bin/chpl-language-server # Libraries cp -r %{_prefix}/lib/chapel %{buildroot}/%{_prefix}/lib/chapel -cp -r %{_prefix}/lib/cmake/chpl %{buildroot}/%{_prefix}/lib/cmake/chpl +cp -r %{_prefix}/lib/cmake/chpl %{buildroot}/%{_prefix}/lib/cmake # CHPL_HOME cp -r %{_prefix}/share/chapel %{buildroot}/%{_prefix}/share/chapel @@ -47,5 +47,7 @@ cp -r %{_prefix}/share/chapel %{buildroot}/%{_prefix}/share/chapel %{_prefix}/bin/chpl-language-server %{_prefix}/lib/chapel/* %{_prefix}/share/chapel/* +%{_prefix}/lib/cmake/chpl/* + %changelog From 90aeabf1d984df7636dc06377d79f8dc00005524 Mon Sep 17 00:00:00 2001 From: Jade Abraham Date: Mon, 14 Apr 2025 14:23:55 -0700 Subject: [PATCH 9/9] update copy_files Signed-off-by: Jade Abraham --- util/packaging/apt/common/copy_files.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/util/packaging/apt/common/copy_files.py b/util/packaging/apt/common/copy_files.py index 638ae0a2b212..f07b7c3ea20a 100644 --- a/util/packaging/apt/common/copy_files.py +++ b/util/packaging/apt/common/copy_files.py @@ -1,4 +1,5 @@ import sys +import os import subprocess as sp from package_name import package_name @@ -20,4 +21,6 @@ for f in files: sp.check_call(["cp", f, f"{deb_name}{f}"]) for d in dirs: + dirname = os.path.dirname(d) + os.makedirs(f"{deb_name}{dirname}", exist_ok=True) sp.check_call(["cp", "-r", d, f"{deb_name}{d}"])