Refactor disable-restrict-mode

jondy · jondy · commit 64a4c715bf3b · 2018-11-13T12:02:57.000+08:00
diff --git a/src/examples/build-for-exe.bat b/src/examples/build-for-exe.bat
@@ -94,7 +94,7 @@ cd /D %PROJECT%
 
 REM This is the key, change default runtime path, otherwise dynamic library _pytransform could not be found
 Echo.
-Call pyarmor.bat config --runtime-path="" --disable-restrict-mode=1 --manifest "global-include *.py, exclude %ENTRY_SCRIPT% setup.py pytransform.py, prune build, prune dist"
+Call pyarmor.bat config --runtime-path="" --manifest "global-include *.py, exclude %ENTRY_SCRIPT% setup.py pytransform.py, prune build, prune dist"
 
 REM Obfuscate scripts without runtime files, only obfuscated scripts are generated
 Echo.
diff --git a/src/examples/build-for-freeze.bat b/src/examples/build-for-freeze.bat
@@ -93,7 +93,7 @@ cd /D %PROJECT%
 
 REM This is the key, change default runtime path, otherwise dynamic library _pytransform could not be found
 Echo.
-Call pyarmor.bat config --runtime-path="" --disable-restrict-mode=1 --manifest "global-include *.py, exclude %ENTRY_SCRIPT% setup.py pytransform.py, prune build, prune dist"
+Call pyarmor.bat config --runtime-path="" --manifest "global-include *.py, exclude %ENTRY_SCRIPT% setup.py pytransform.py, prune build, prune dist"
 
 REM Obfuscate scripts without runtime files, only obfuscated scripts are generated
 Echo.
@@ -116,7 +116,7 @@ Echo.
 SetLocal
     Cd /D %SOURCE%
     %PYTHON% setup.py build
-    If NOT ERRORLEVEL 0 Goto END 
+    If NOT ERRORLEVEL 0 Goto END
 EndLocal
 
 Echo.
@@ -155,7 +155,7 @@ If "%TEST_OBFUSCATED_SCRIPTS%" == "1" (
     Echo.
     Echo Prepare to run %ENTRY_EXE% with obfuscated scripts
     Pause
-    
+
     Cd /D %OUTPUT%
     %ENTRY_EXE%
 )
diff --git a/src/examples/obfuscate-pkg.bat b/src/examples/obfuscate-pkg.bat
@@ -72,7 +72,7 @@ ECHO.
 REM Generate an expired license if LICENSE_EXPIRED_DATE is set
 SET LICENSE_CODE=expired-%LICENSE_EXPIRED_DATE%
 IF DEFINED LICENSE_EXPIRED_DATE (
-  %PYTHON% pyarmor.py licenses --disable-restrict-mode --expired %LICENSE_EXPIRED_DATE% %LICENSE_CODE%
+  %PYTHON% pyarmor.py licenses --expired %LICENSE_EXPIRED_DATE% %LICENSE_CODE%
   IF NOT ERRORLEVEL 0 GOTO END
 
   REM Overwrite default license with this expired license
diff --git a/src/examples/obfuscate-pkg.sh b/src/examples/obfuscate-pkg.sh
@@ -45,7 +45,7 @@ $PYTHON pyarmor.py obfuscate --recursive --no-restrict --src "$PKGPATH" --entry
 if [[ -n "${LICENSE_EXPIRED_DATE}" ]] ; then
     echo
     LICENSE_CODE="expired-${LICENSE_EXPIRED_DATE}"
-    $PYTHON pyarmor.py licenses --disable-restrict-mode --expired ${LICENSE_EXPIRED_DATE} ${LICENSE_CODE} || exit 1
+    $PYTHON pyarmor.py licenses --expired ${LICENSE_EXPIRED_DATE} ${LICENSE_CODE} || exit 1
     echo
 
     # Overwrite default license with this expired license
diff --git a/src/packer.py b/src/packer.py
@@ -158,8 +158,8 @@ def _packer(src, entry, build, script, packcmd, output, libname):
 
     filters = ('global-include *.py', 'prune build, prune dist',
                'exclude %s pytransform.py' % entry)
-    args = ('config', '--runtime-path', '', '--disable-restrict-mode', '1',
-               '--manifest', ','.join(filters), project)
+    args = ('config', '--runtime-path', '', 
+            '--manifest', ','.join(filters), project)
     call_armor(args)
 
     args = 'build', project
diff --git a/src/user-guide.md b/src/user-guide.md
@@ -1101,7 +1101,7 @@ to this capsule.
 ```
 usage: pyarmor.py licenses [-h] [-e YYYY-MM-DD] [-d SN] [-4 a.b.c.d]
                            [-m x:x:x:x] [--bind-domain DOMAIN] [-P PROJECT]
-                           [-C CAPSULE] [-O OUTPUT] [--disable-restrict-mode]
+                           [-C CAPSULE] [-O OUTPUT] [--restrict]
                            CODE [CODE ...]
 
 positional arguments:
@@ -1115,8 +1115,8 @@ optional arguments:
                         Project capsule
   -O OUTPUT, --output OUTPUT
                         Output path
-  --disable-restrict-mode
-                        Disable restrict mode
+  --restrict
+                        Generate license for restrict mode
 
 Bind license to hardware:
   -e YYYY-MM-DD, --expired YYYY-MM-DD
@@ -1155,7 +1155,7 @@ Then generate licenses
     # Expired license
     python pyarmor.py licenses --expired=2018-05-12 Customer-Jordan
     python pyarmor.py licenses --capsule=project2.zip \
-        --disable-restrict-mode --output=/home/jondy/project2 \
+        --output=/home/jondy/project2 \
         --expired=2018-05-12 Customer-Jordan
 
     # Expired license for project
diff --git a/tests/function-test.sh b/tests/function-test.sh
@@ -100,8 +100,7 @@ cp test/data/project.zip .pyarmor_capsule.zip
 $PYARMOR licenses --expired=2018-05-12 Customer-Jordan >result.log 2>&1
 check_file_exists licenses/Customer-Jordan/license.lic
 
-$PYARMOR licenses --capsule=test/data/project.zip \
-    --disable-restrict-mode --output=projects \
+$PYARMOR licenses --capsule=test/data/project.zip --output=projects \
     --expired=2018-05-12 Customer-Jordan >result.log 2>&1
 check_file_exists projects/licenses/Customer-Jordan/license.lic
 
diff --git a/tests/system-test.sh b/tests/system-test.sh
@@ -87,8 +87,7 @@ $PYARMOR obfuscate --src examples/simple --entry queens.py \
 check_return_value
 check_file_exists dist3/queens.py
 
-$PYARMOR licenses --expired $(next_month) --disable-restrict-mode Jondy \
-    >result.log 2>&1
+$PYARMOR licenses --expired $(next_month) Jondy >result.log 2>&1
 check_return_value
 check_file_exists licenses/Jondy/license.lic
 cp licenses/Jondy/license.lic dist3/
