rbx.cp 0.5.67__tar.gz → 0.5.69__tar.gz

{rbx_cp-0.5.67 → rbx_cp-0.5.69}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: rbx.cp
-Version: 0.5.67
+Version: 0.5.69
 Summary: 
 Author: Roberto Sales
 Requires-Python: >=3.9,<4.0

{rbx_cp-0.5.67 → rbx_cp-0.5.69}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "rbx.cp"
-version = "0.5.67"
+version = "0.5.69"
 description = ""
 packages = [
   {include = "rbx"}

{rbx_cp-0.5.67 → rbx_cp-0.5.69}/rbx/box/solutions.py

@@ -725,26 +725,24 @@ def expand_solutions_with_source(sols: List[str]) -> List[Tuple[Solution, bool]]
     pkg_sols = {str(sol.path): sol for sol in pkg.solutions}
 
     # Download remote sols.
-    sols = remote.expand_files(sols)
+    path_sols = remote.expand_files(sols)
 
     # Ensure sols exist.
-    sols = [sol for sol in sols if pathlib.Path(sol).is_file()]
+    path_sols = [sol for sol in path_sols if sol.is_file()]
 
     seen_sols = set()
     res: List[Tuple[Solution, bool]] = []
-    for sol in sols:
-        if sol in seen_sols:
+    for sol in path_sols:
+        if str(sol) in seen_sols:
             # This solution was already added.
             continue
-        if sol in pkg_sols:
+        if str(sol) in pkg_sols:
             # This solution is in the package.
-            res.append((pkg_sols[sol], False))
+            res.append((pkg_sols[str(sol)], False))
         else:
             # This solution is fetched from some source.
-            res.append(
-                (Solution(path=pathlib.Path(sol), outcome=ExpectedOutcome.ANY), True)
-            )
-        seen_sols.add(sol)
+            res.append((Solution(path=sol, outcome=ExpectedOutcome.ANY), True))
+        seen_sols.add(str(sol))
     return res
 
 

{rbx_cp-0.5.67 → rbx_cp-0.5.69}/rbx/resources/packagers/boca/compile/java

@@ -115,6 +115,12 @@ if [ -n "$(sed -n -E "/$regex/p" src/$name)" ]; then
   sed -i -E "s/$regex/public class Main\1/" src/Main.java
 fi
 
+echo "Klass is $klass"
+
+cat <<EOF >src/Manifest.txt
+Main-Class: $klass
+EOF
+
 cat <<EOF >compileit.sh
 #!/bin/bash
 javac=$(which javac)
@@ -140,7 +146,7 @@ find . -name "*.java" | while read lin; do
   echo \$? > ../compileit.retcode
 done
 rm -f ../$jarfile
-\$jar cvfe ../$jarfile \$klass *
+\$jar cfm ../$jarfile Manifest.txt *
 exit 0
 EOF
 chmod 755 compileit.sh
@@ -182,6 +188,7 @@ fi
 if [ -f "stderr0" ]; then
   cat "stderr0"
 fi
+
 rm -rf src/
 if [ "$ret" != "0" ]; then
   echo "Compilation Error: $ret"

{rbx_cp-0.5.67 → rbx_cp-0.5.69}/rbx/resources/packagers/boca/compile/py2

@@ -115,13 +115,13 @@ if [ ! -x "\$cc" ]; then
     exit 47
 fi
 cd src
-"\$cc" -m py_compile "$name"
-pyc_ret=\$?
-if [ "\$pyc_ret" != "0" ]; then
-    echo "python syntax check failed: \$pyc_ret"
-    echo \$pyc_ret > ../compileit.retcode
-    exit 0
-fi
+# "\$cc" -m py_compile "$name"
+# pyc_ret=\$?
+# if [ "\$pyc_ret" != "0" ]; then
+#     echo "python syntax check failed: \$pyc_ret"
+#     echo \$pyc_ret > ../compileit.retcode
+#     exit 0
+# fi
 
 echo "#!/usr/bin/python2" | cat - "$name" > "../$exe"
 chmod 755 "../$exe"

{rbx_cp-0.5.67 → rbx_cp-0.5.69}/rbx/resources/packagers/boca/compile/py3

@@ -115,13 +115,13 @@ if [ ! -x "\$cc" ]; then
     exit 47
 fi
 cd src
-"\$cc" -m py_compile "$name"
-pyc_ret=\$?
-if [ "\$pyc_ret" != "0" ]; then
-    echo "python syntax check failed: \$pyc_ret"
-    echo \$pyc_ret > ../compileit.retcode
-    exit 0
-fi
+# "\$cc" -m py_compile "$name"
+# pyc_ret=\$?
+# if [ "\$pyc_ret" != "0" ]; then
+#     echo "python syntax check failed: \$pyc_ret"
+#     echo \$pyc_ret > ../compileit.retcode
+#     exit 0
+# fi
 
 echo "#!/usr/bin/python3" | cat - "$name" > "../$exe"
 chmod 755 "../$exe"