fix: simplify build scripts

Author: qubka

CMakeLists.txt

@@ -8,7 +8,7 @@ endif()
 file(READ "${CMAKE_CURRENT_SOURCE_DIR}/version.txt" VERSION_FILE_CONTENTS)
 string(STRIP "${VERSION_FILE_CONTENTS}" VERSION_FILE_CONTENTS)
 set(CPPLM_VERSION "${VERSION_FILE_CONTENTS}" CACHE STRING "Set version name")
-set(CPPLM_PACKAGE "plugify-module-cpp" CACHE STRING "Set package name")
+set(CPPLM_PACKAGE "cpp_module" CACHE STRING "Set package name")
 string(REPLACE "v" "" CPPLM_VERSION "${CPPLM_VERSION}")
 string(REGEX REPLACE "[.+-]" ";" CPPLM_VERSION_LIST ${CPPLM_VERSION})
 list(GET CPPLM_VERSION_LIST 0 CPPLM_VERSION_MAJOR)
@@ -44,7 +44,7 @@ set(PLUGIFY_BUILD_SHARED_LIB ON CACHE INTERNAL "")
 set(PLUGIFY_BUILD_TESTS OFF CACHE INTERNAL "")
 if(LINUX)
     set(PLUGIFY_USE_STATIC_STDLIB ON CACHE INTERNAL "")
-    set(PLUGIFY_USE_ABI0 ON CACHE INTERNAL "")
+    set(PLUGIFY_USE_ABI0 OFF CACHE INTERNAL "")
 endif()
 add_subdirectory(external/plugify)
 

conda/bld.bat

@@ -3,11 +3,12 @@ REM bld.bat - For Windows builds
 
 REM Create the target directories
 if not exist "%PREFIX%\bin" mkdir "%PREFIX%\bin"
-if not exist "%PREFIX%" mkdir "%PREFIX%"
 
-REM Copy the DLL and module file
-copy bin\plugify-module-cpp.dll "%PREFIX%\bin\" || exit 1
-copy plugify-module-cpp.pmodule "%PREFIX%\" || exit 1
+REM Copy entire folders into %PREFIX
+xcopy bin "%PREFIX%\bin" /E /Y /I
+
+REM Copy all .pmodule files into %PREFIX%
+copy *.pmodule "%PREFIX%\" || exit 1
 
 REM Create activation scripts
 if not exist "%PREFIX%\etc\conda\activate.d" mkdir "%PREFIX%\etc\conda\activate.d"

conda/build.sh

@@ -3,17 +3,16 @@
 
 set -ex
 
-# Create the target directories
+# Copy entire bin/ folder into $PREFIX/bin/
 mkdir -p $PREFIX/bin
-mkdir -p $PREFIX
+cp -r bin/* $PREFIX/bin/
 
-# Copy the shared library and module file
-cp bin/libplugify-module-cpp.so $PREFIX/bin/
-cp plugify-module-cpp.pmodule $PREFIX/
+# Copy all .pmodule files into $PREFIX/
+cp -r *.pmodule $PREFIX/
 
-# Set proper permissions
-chmod 755 $PREFIX/bin/libplugify-module-cpp.so
-chmod 644 $PREFIX/plugify-module-cpp.pmodule
+# Fix permissions (recursively for bin, selective for modules)
+chmod -R 755 $PREFIX/bin
+chmod 644 $PREFIX/*.pmodule
 
 # Create activation scripts for proper library path
 mkdir -p $PREFIX/etc/conda/activate.d

external/plugify

@@ -584,7 +584,15 @@ def main(manifest_path: str, output_dir: str, override: bool):
         print(f'Output directory does not exist: {output_dir}')
         return 1
 
-    plugin_name = os.path.basename(manifest_path).rsplit('.', 3)[0]
+    try:
+        with open(manifest_path, 'r', encoding='utf-8') as file:
+            pplugin = json.load(file)
+            
+    except Exception as e:
+        print(f'An error occurred: {e}')
+        return 1
+
+    plugin_name = pplugin.get('name', os.path.basename(manifest_path).rsplit('.', 3)[0])
     output_path = os.path.join(output_dir, 'pps', f'{plugin_name}.hpp')
     os.makedirs(os.path.dirname(output_path), exist_ok=True)
 
@@ -593,9 +601,6 @@ def main(manifest_path: str, output_dir: str, override: bool):
         return 1
 
     try:
-        with open(manifest_path, 'r', encoding='utf-8') as file:
-            pplugin = json.load(file)
-
         content = generate_header(plugin_name, pplugin)
 
         with open(output_path, 'w', encoding='utf-8') as file:

generator/generator.py

@@ -55,7 +55,7 @@ namespace plg {
 
     template<typename E>
     constexpr auto value(std::size_t v) {
-        return static_cast<E>(ENUM_MIN_VALUE + v);
+        return static_cast<E>(ENUM_MIN_VALUE + static_cast<int>(v));
     }
 
     template<std::size_t N>