rename to r3.php

master
Theunis J. Botha 2021-07-12 12:03:23 +02:00
parent 5b48b2fbf0
commit d6f6ec310f
4 changed files with 14 additions and 16 deletions

View File

@ -17,7 +17,7 @@ services:
- ${R3_CONTEXT}/build_events.php:/app/build_events.php
- ${R3_CONTEXT}/create_class.php:/app/create_class.php
- ${R3_CONTEXT}/update_options.php:/app/update_options.php
- ${R3_CONTEXT}/update_templates.php:/app/update_templates.php
- ${R3_CONTEXT}/r3.php:/app/update_templates.php
- ${R3_CONTEXT}/.r3_history:/app/.r3_history
networks:
- r3_network

View File

@ -2,9 +2,7 @@
<module type="WEB_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/r3-libs/r3-v2/dist" />
</content>
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>

@ -1 +1 @@
Subproject commit 3c955fe495a9a200cded1aa8d4b472a413118300
Subproject commit 3711c858872bb9991da11a04358c0acacf900766

22
r3.sh
View File

@ -206,21 +206,21 @@ then
# cd "${R3_V2_LIB_PATH}" 2>&1 || exit 3
#
# ./update_templates.php "${R3_FOLDER}${FILE_NAME}" save
# ./r3.php "${R3_FOLDER}${FILE_NAME}" save
# RESULT=$?
# if [ "${RESULT}" = 1 ];
# then
# exit 5
# fi
#
# ./update_templates.php "${R3_FOLDER}${FILE_NAME}" restore
# ./r3.php "${R3_FOLDER}${FILE_NAME}" restore
# RESULT=$?
# if [ "${RESULT}" = 1 ];
# then
# exit 5
# fi
#
# ./update_templates.php all build-dist
# ./r3.php all build-dist
#
# cd - 2>&1 || exit 3
@ -280,7 +280,7 @@ then
# grep -n "^class.*extends" src/r3/* -R | sed "s/src\/r3\(.*\).js.*class\s*\(.*\) extends \(.*\) {/R3.\3.\2 = require('.\1.js');/" | sed "s/R3Object/Object/"
./update_templates.php all build-dist
./r3.php all build-dist
cd - 2>&1 || exit 3
@ -328,7 +328,7 @@ then
# set -o xtrace
./update_templates.php "${FILE}" save
./r3.php "${FILE}" save
RESULT=$?
if [ "${RESULT}" = 1 ];
then
@ -342,7 +342,7 @@ then
exit 5
fi
./update_templates.php "${FILE}" restore
./r3.php "${FILE}" restore
RESULT=$?
if [ "${RESULT}" = 1 ];
then
@ -354,7 +354,7 @@ then
echo "building graph"
./update_templates.php all build-dist
./r3.php all build-dist
cd - 2>&1 || exit 3
@ -373,10 +373,10 @@ then
check_file_found "${ARG1}"
./update_templates.php "${FILE}" update-options
./r3.php "${FILE}" update-options
else
./update_templates.php all update-options
./r3.php all update-options
fi
cd - 2>&1 || exit 3
@ -396,10 +396,10 @@ then
check_file_found "${ARG1}"
./update_templates.php "${FILE}" install-methods
./r3.php "${FILE}" install-methods
else
./update_templates.php all install-methods
./r3.php all install-methods
fi
cd - 2>&1 || exit 3