pd4web 2.1.2__tar.gz → 2.2.2__tar.gz

{pd4web-2.1.2 → pd4web-2.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pd4web
-Version: 2.1.2
+Version: 2.2.2
 Summary: pd4web compiles PureData patches with external objects for Wasm, allowing to run entire patches in web browsers.
 Home-page: https://charlesneimog.github.io/pd4web
 Author: Charles K. Neimog
@@ -43,7 +43,7 @@ Description-Content-Type: text/markdown
 </p>
 
 <p align="center">
-  <a href="https://github.com/charlesneimog/pd4web/actions/workflows/Publish.yml"><img src="https://github.com/charlesneimog/pd4web/actions/workflows/Publish.yml/badge.svg" alt="Tests"></a>
+  <a href="https://github.com/charlesneimog/pd4web/actions/workflows/Release.yml"><img src="https://github.com/charlesneimog/pd4web/actions/workflows/Release.yml/badge.svg" alt="Tests"></a>
 </p>
 
 `pd4web` lets you run PureData patches directly in web browsers. It stands out from alternatives like [hvcc](https://github.com/Wasted-Audio/hvcc) and [WebPd](https://github.com/sebpiq/WebPd) by compiling the source code of [libpd](https://github.com/libpd/libpd), thanks to the work of [claudeha](https://github.com/claudeha). With `pd4web`, you can compile any PureData Vanilla patch, along with a list of more than 800 externals and abstractions.

{pd4web-2.1.2 → pd4web-2.2.2}/README.md

@@ -20,7 +20,7 @@
 </p>
 
 <p align="center">
-  <a href="https://github.com/charlesneimog/pd4web/actions/workflows/Publish.yml"><img src="https://github.com/charlesneimog/pd4web/actions/workflows/Publish.yml/badge.svg" alt="Tests"></a>
+  <a href="https://github.com/charlesneimog/pd4web/actions/workflows/Release.yml"><img src="https://github.com/charlesneimog/pd4web/actions/workflows/Release.yml/badge.svg" alt="Tests"></a>
 </p>
 
 `pd4web` lets you run PureData patches directly in web browsers. It stands out from alternatives like [hvcc](https://github.com/Wasted-Audio/hvcc) and [WebPd](https://github.com/sebpiq/WebPd) by compiling the source code of [libpd](https://github.com/libpd/libpd), thanks to the work of [claudeha](https://github.com/claudeha). With `pd4web`, you can compile any PureData Vanilla patch, along with a list of more than 800 externals and abstractions.

{pd4web-2.1.2 → pd4web-2.2.2}/Sources/Libraries/libpd.cmake

@@ -3,13 +3,31 @@ project(libpd C)
 
 set(ENABLE_TILDE_TARGET_WARNING off)
 
-if (LSP_SUPPORT)
-	set(PD_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/build/pure-data/src/)
+if(LSP_SUPPORT)
+    set(PD_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/build/pure-data/src/)
 else()
-	set(PD_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Pd4Web/pure-data/src/)
+    set(PD_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Pd4Web/pure-data/src/)
 endif()
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread -matomics -mbulk-memory")
 
+# ╭──────────────────────────────────────╮
+# │       Remove print of sys_vgui       │
+# ╰──────────────────────────────────────╯
+# Função para adicionar 'return;' após o comentário específico, se ainda não existir
+function(AddReturnAfterComment file start_block return_statement)
+    file(READ ${file} FILE_CONTENTS)
+    string(FIND "${FILE_CONTENTS}" "${start_block}\n    return;" POSITION)
+    if(POSITION EQUAL -1)
+        string(REPLACE "${start_block}" "${start_block}\n    return;" FILE_CONTENTS
+                       "${FILE_CONTENTS}")
+        file(WRITE ${file} "${FILE_CONTENTS}")
+    endif()
+endfunction()
+
+addreturnaftercomment(
+    ${PD_SOURCE_DIR}/s_inter.c "{       /* if there's no TK process just throw it to stderr */"
+    "             return;")
+
 # ╭──────────────────────────────────────╮
 # │           PureData Sources           │
 # ╰──────────────────────────────────────╯

{pd4web-2.1.2 → pd4web-2.2.2}/Sources/pd4web/Builder.py

@@ -3,6 +3,7 @@ import re
 import shutil
 import subprocess
 import importlib.metadata as importlib_metadata
+import yaml
 
 # from .Patch import PatchLine
 from .Pd4Web import Pd4Web
@@ -42,6 +43,9 @@ class GetAndBuildExternals:
         self.ConfigureProject()
         self.CompileProject()
         self.CopyExtraJsFiles()
+        
+        # Save the project versions
+        self.SaveProjectVersions()
 
     def InitVariables(self):
         self.cmakeFile = []
@@ -56,18 +60,18 @@ class GetAndBuildExternals:
         else:
             self.ProjectName = os.path.basename(self.Pd4Web.PROJECT_ROOT)
         self.cmakeFile.append("cmake_minimum_required(VERSION 3.25)")
-        self.cmakeFile.append(f"project({self.ProjectName})\n")
+        self.cmakeFile.append(f'project("{self.ProjectName}")\n')
 
         # Pd Sources
         self.cmakeFile.append("# Pd sources")
         self.cmakeFile.append('set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread -matomics -mbulk-memory")')
-        self.cmakeFile.append("include(${CMAKE_CURRENT_SOURCE_DIR}/Pd4Web/libpd.cmake)")
-        self.cmakeFile.append("include(${CMAKE_CURRENT_SOURCE_DIR}/Pd4Web/Externals/pd.cmake)")
+        self.cmakeFile.append('include("${CMAKE_CURRENT_SOURCE_DIR}/Pd4Web/libpd.cmake")')
+        self.cmakeFile.append('include("${CMAKE_CURRENT_SOURCE_DIR}/Pd4Web/Externals/pd.cmake")')
         self.cmakeFile.append('set(PDCMAKE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Pd4Web/Externals/" CACHE STRING "" FORCE)')
         self.cmakeFile.append(
             'set(PD4WEB_EXTERNAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Pd4Web/Externals/" CACHE STRING "" FORCE)'
         )
-        self.cmakeFile.append("include_directories(${CMAKE_CURRENT_SOURCE_DIR}/Pd4Web/pure-data/src)")
+        self.cmakeFile.append('include_directories("${CMAKE_CURRENT_SOURCE_DIR}/Pd4Web/pure-data/src")')
         self.cmakeFile.append("add_definitions(-DPDTHREADS)")
         self.cmakeFile.append("")
 
@@ -102,7 +106,7 @@ class GetAndBuildExternals:
 
         targetProperties = [
             "set_target_properties(pd4web PROPERTIES",
-            "    RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/WebPatch",
+            '    RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/WebPatch"',
             ")",
         ]
         linkOptions = [
@@ -264,23 +268,23 @@ class GetAndBuildExternals:
 
     def AddFilesToWebPatch(self):
         self.cmakeFile.append("\n# FileSystem for the Patch")
-        string = 'set_target_properties(pd4web PROPERTIES LINK_FLAGS "--preload-file ${CMAKE_CURRENT_SOURCE_DIR}/WebPatch/index.pd@/index.pd")'
+        #string = 'set_target_properties(pd4web PROPERTIES LINK_FLAGS "--preload-file \"${CMAKE_CURRENT_SOURCE_DIR}/WebPatch/index.pd@/index.pd\"")'
+        string = 'set_target_properties(pd4web PROPERTIES LINK_FLAGS "--preload-file \\"${CMAKE_CURRENT_SOURCE_DIR}/WebPatch/index.pd@/index.pd\\"")'
         self.cmakeFile.append(string)
-
         if os.path.exists(self.Pd4Web.PROJECT_ROOT + "/Audios"):
             self.cmakeFile.append("get_target_property(EMCC_LINK_FLAGS pd4web LINK_FLAGS)")
             self.cmakeFile.append(
-                'set_target_properties(pd4web PROPERTIES LINK_FLAGS "${EMCC_LINK_FLAGS} --preload-file ${CMAKE_CURRENT_SOURCE_DIR}/Audios@/Audios/")'
+                'set_target_properties(pd4web PROPERTIES LINK_FLAGS "${EMCC_LINK_FLAGS} --preload-file \\"${CMAKE_CURRENT_SOURCE_DIR}/Audios@/Audios/\\"")'
             )
         if os.path.exists(self.Pd4Web.PROJECT_ROOT + "/.tmp"):
             self.cmakeFile.append("get_target_property(EMCC_LINK_FLAGS pd4web LINK_FLAGS)")
             self.cmakeFile.append(
-                'set_target_properties(pd4web PROPERTIES LINK_FLAGS "${EMCC_LINK_FLAGS} --preload-file ${CMAKE_CURRENT_SOURCE_DIR}/.tmp@/Libs/")'
+                'set_target_properties(pd4web PROPERTIES LINK_FLAGS "${EMCC_LINK_FLAGS} --preload-file \\"${CMAKE_CURRENT_SOURCE_DIR}/.tmp@/Libs/\\"")'
             )
         if os.path.exists(self.Pd4Web.PROJECT_ROOT + "/Extras"):
             self.cmakeFile.append("get_target_property(EMCC_LINK_FLAGS pd4web LINK_FLAGS)")
             self.cmakeFile.append(
-                'set_target_properties(pd4web PROPERTIES LINK_FLAGS "${EMCC_LINK_FLAGS} --preload-file ${CMAKE_CURRENT_SOURCE_DIR}/Extras@/Extras/")'
+                'set_target_properties(pd4web PROPERTIES LINK_FLAGS "${EMCC_LINK_FLAGS} --preload-file \\"${CMAKE_CURRENT_SOURCE_DIR}/Extras@/Extras/\\"")'
             )
 
     def CreateCppCallsExternalFile(self):
@@ -498,8 +502,14 @@ class GetAndBuildExternals:
             for file in files:
                 if not os.path.exists(self.Pd4Web.PROJECT_ROOT + "/WebPatch/" + file):
                     shutil.copy(os.path.join(root, file), self.Pd4Web.PROJECT_ROOT + "/WebPatch/")
-
         os.chdir(cwd)
+        
+    def SaveProjectVersions(self):
+        # check if file exists
+        if not os.path.exists(self.Pd4Web.PROJECT_ROOT + "/Pd4Web/versions.yaml"):
+            with open(self.Pd4Web.PROJECT_ROOT + "/Pd4Web/versions.yaml", "w") as f:
+                yaml.dump(self.Pd4Web.Version, f)
+                return       
 
     def __repr__(self) -> str:
         return f"< GetCode Object >"

{pd4web-2.1.2 → pd4web-2.2.2}/Sources/pd4web/Libraries.py

@@ -145,7 +145,7 @@ class ExternalLibraries:
             commit = libRepo.head.peel()
         return commit
 
-    def CloneLibrary(self, libsPath, libData):
+    def CloneLibrary(self, libData):
         """
         Initializes submodules in the specified repository path.
 
@@ -158,11 +158,12 @@ class ExternalLibraries:
             curr_commit: pygit2.Commit = libRepo.head.peel()
             lib_commit: pygit2.Commit = self.getLibCommitVersion(libRepo, libData.version)
             if curr_commit.id == lib_commit.id:
-                # print(f"Library {libData.repo} is in the right commit", color="green")
-                return  # library up-to-date
+                self.Pd4Web.Version["externals"][libData.name] = str(lib_commit.id)
+                return  
             libRepo.set_head(lib_commit.id)
             libRepo.checkout_tree(lib_commit)
             libRepo.reset(lib_commit.id, pygit2.GIT_RESET_HARD)
+            self.Pd4Web.Version["externals"][libData.name] = str(lib_commit.id)
             return
 
         libLink = f"https://github.com/{libData.dev}/{libData.repo}"
@@ -187,6 +188,8 @@ class ExternalLibraries:
             submodule_collection.update()
         except:
             self.Pd4Web.exception("Failed to initialize submodules.")
+            
+        self.Pd4Web.Version["externals"][libData.name] = str(commit.id)
 
         # TODO: Try to merge commits from submodules
         # try:
@@ -212,7 +215,7 @@ class ExternalLibraries:
             os.mkdir(self.Pd4Web.APPDATA + "/Externals")
 
         libFolder = self.Pd4Web.APPDATA + f"/Externals/{libData.name}"
-        self.CloneLibrary(libFolder, libData)
+        self.CloneLibrary(libData)
         if not os.path.exists(self.PROJECT_ROOT + f"/Pd4Web/Externals/{libData.name}"):
             self.Pd4Web.print(
                 f"Copying {libData.name} to Pd4Web/Externals...",

{pd4web-2.1.2 → pd4web-2.2.2}/Sources/pd4web/Pd4Web.py

@@ -83,6 +83,41 @@ class Pd4Web:
 
         self.Execute()
 
+    def InitVariables(self):
+        from .Objects import Objects
+        from .Libraries import ExternalLibraries
+
+        self.cpuCores = os.cpu_count()
+        self.usedObjects = []
+        self.patchLinesProcessed = []
+        self.uiReceiversSymbol = []
+        self.externalsSourceCode = []
+        self.externalsLinkLibraries = []
+        self.externalsLinkLibrariesFolders = []
+        self.externalsSetupFunctions = []
+
+        self.declaredLocalAbs = []
+        self.declaredLibsObjs = []
+        self.declaredPaths = []
+        self.processedAbs = []
+        
+        # Versions
+        self.Version = {}
+        self.Version["python"] = f"{sys.version_info.major}.{sys.version_info.minor}.{sys.version_info.micro}"
+        self.Version["pure-data"] = self.PD_VERSION
+        self.Version["emsdk"] = self.EMSDK_VERSION
+        self.Version["pd4web"] = importlib_metadata.version("pd4web")
+        self.Version["externals"] = {}
+
+        self.Libraries: ExternalLibraries = ExternalLibraries(self)
+        self.Objects: Objects = Objects(self)
+
+        self.env = os.environ.copy()
+        python_dir = os.path.dirname(sys.executable)
+        self.env["PATH"] = f"{python_dir};{self.env['PATH']}"
+        self.env["PYTHON"] = sys.executable
+        self.env["EMSDK_QUIET"] = "1"
+        
     def Execute(self):
         from .Builder import GetAndBuildExternals
         from .Compilers import ExternalsCompiler
@@ -156,32 +191,7 @@ class Pd4Web:
         if not os.path.exists(self.APPDATA):
             os.makedirs(self.APPDATA)
 
-    def InitVariables(self):
-        from .Objects import Objects
-        from .Libraries import ExternalLibraries
-
-        self.cpuCores = os.cpu_count()
-        self.usedObjects = []
-        self.patchLinesProcessed = []
-        self.uiReceiversSymbol = []
-        self.externalsSourceCode = []
-        self.externalsLinkLibraries = []
-        self.externalsLinkLibrariesFolders = []
-        self.externalsSetupFunctions = []
-
-        self.declaredLocalAbs = []
-        self.declaredLibsObjs = []
-        self.declaredPaths = []
-        self.processedAbs = []
-
-        self.Libraries = ExternalLibraries(self)
-        self.Objects: Objects = Objects(self)
-
-        self.env = os.environ.copy()
-        python_dir = os.path.dirname(sys.executable)
-        self.env["PATH"] = f"{python_dir};{self.env['PATH']}"
-        self.env["PYTHON"] = sys.executable
-        self.env["EMSDK_QUIET"] = "1"
+    
 
     def DownloadZip(self, url, filename, what=""):
         self.print(f"Downloading {what}...", color="green", silence=self.SILENCE)
@@ -352,6 +362,8 @@ class Pd4Web:
             type=str,
             help="Pure Data version to use",
         )
+        
+        # Pd Object
         parser.add_argument(
             "--pd-external",
             required=False,
@@ -359,6 +371,14 @@ class Pd4Web:
             action="store_true",
             help="If is it pd4web external",
         )
+        
+        parser.add_argument(
+            "--pd-external-version",
+            required=False,
+            default=importlib_metadata.version("pd4web"),
+            type=str,
+            help="Version of the pd4web external being used",
+        )
 
         ## User
         parser.add_argument(

{pd4web-2.1.2 → pd4web-2.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pd4web"
-version = "2.1.2"
+version = "2.2.2"
 description = "pd4web compiles PureData patches with external objects for Wasm, allowing to run entire patches in web browsers."
 authors = ["Charles K. Neimog <charlesneimog@outlook.com>"]
 readme = "README.md"