cybafelo
/
r3-cloud
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker-compose.yml
View File

@ -17,7 +17,7 @@ services:
- ${R3_CONTEXT}/build_events.php:/app/build_events.php - ${R3_CONTEXT}/build_events.php:/app/build_events.php
- ${R3_CONTEXT}/create_class.php:/app/create_class.php - ${R3_CONTEXT}/create_class.php:/app/create_class.php
- ${R3_CONTEXT}/update_options.php:/app/update_options.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 - ${R3_CONTEXT}/.r3_history:/app/.r3_history
networks: networks:
- r3_network - r3_network

4
r3-cloud.iml
View File

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

2
r3-libs/r3-v2

@ -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 # 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=$? # RESULT=$?
# if [ "${RESULT}" = 1 ]; # if [ "${RESULT}" = 1 ];
# then # then
# exit 5 # exit 5
# fi # fi
# #
# ./update_templates.php "${R3_FOLDER}${FILE_NAME}" restore # ./r3.php "${R3_FOLDER}${FILE_NAME}" restore
# RESULT=$? # RESULT=$?
# if [ "${RESULT}" = 1 ]; # if [ "${RESULT}" = 1 ];
# then # then
# exit 5 # exit 5
# fi # fi
# #
# ./update_templates.php all build-dist # ./r3.php all build-dist
# #
# cd - 2>&1 || exit 3 # 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/" # 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 cd - 2>&1 || exit 3
@ -328,7 +328,7 @@ then
# set -o xtrace # set -o xtrace
./update_templates.php "${FILE}" save ./r3.php "${FILE}" save
RESULT=$? RESULT=$?
if [ "${RESULT}" = 1 ]; if [ "${RESULT}" = 1 ];
then then
@ -342,7 +342,7 @@ then
exit 5 exit 5
fi fi
./update_templates.php "${FILE}" restore ./r3.php "${FILE}" restore
RESULT=$? RESULT=$?
if [ "${RESULT}" = 1 ]; if [ "${RESULT}" = 1 ];
then then
@ -354,7 +354,7 @@ then
echo "building graph" echo "building graph"
./update_templates.php all build-dist ./r3.php all build-dist
cd - 2>&1 || exit 3 cd - 2>&1 || exit 3
@ -373,10 +373,10 @@ then
check_file_found "${ARG1}" check_file_found "${ARG1}"
./update_templates.php "${FILE}" update-options ./r3.php "${FILE}" update-options
else else
./update_templates.php all update-options ./r3.php all update-options
fi fi
cd - 2>&1 || exit 3 cd - 2>&1 || exit 3
@ -396,10 +396,10 @@ then
check_file_found "${ARG1}" check_file_found "${ARG1}"
./update_templates.php "${FILE}" install-methods ./r3.php "${FILE}" install-methods
else else
./update_templates.php all install-methods ./r3.php all install-methods
fi fi
cd - 2>&1 || exit 3 cd - 2>&1 || exit 3