renamed generated

r3-libs/r3-v2

@@ -1 +1 @@
-Subproject commit 3711c858872bb9991da11a04358c0acacf900766
+Subproject commit 8d6a1d9d36b64ab7378d8026798ce2e986959017

r3.sh

@@ -83,7 +83,7 @@ cd "${R3_INSTALL_PATH}" 2>&1 || exit 2
 if [ "${TASK}" = 'update-token-db' ];
 then
     echo "updating token.db"
-    grep "\bGENERATE_[A-Z_]*\b" "${R3_V2_SRC_PATH}"/* -R | sed "s/^.*GENERATE_/GENERATE_/" | sed "s/\(_START\|_END\)$//" | sort --unique > "${TEMPLATE_FOLDER}"token.db
+    grep "\bGENERATED_[A-Z_]*\b" "${R3_V2_SRC_PATH}"/* -R | sed "s/^.*GENERATED_/GENERATED_/" | sed "s/\(_START\|_END\)$//" | sort --unique > "${TEMPLATE_FOLDER}"token.db
     grep "\bCUSTOM_[A-Z_]*\b" "${R3_V2_SRC_PATH}"/* -R | sed "s/^.*CUSTOM_/CUSTOM_/" | sed "s/\(_START\|_END\)$//" | sort --unique >> "${TEMPLATE_FOLDER}"token.db
     exit 0;
 fi
@@ -91,7 +91,7 @@ fi
 if [ "${TASK}" = 'create' ];
 then
 #    echo "updating token.db"
-#    grep "GENERATE_.*_START" "${TEMPLATE_FOLDER}"*.template "${R3_FOLDER}"*.js "${R3_SYSTEM_FOLDER}"*.js -R | sed "s/^.*GENERATE_/GENERATE_/" | sed "s/_START$//" | sort --unique > "${TEMPLATE_FOLDER}"token.db
+#    grep "GENERATED_.*_START" "${TEMPLATE_FOLDER}"*.template "${R3_FOLDER}"*.js "${R3_SYSTEM_FOLDER}"*.js -R | sed "s/^.*GENERATED_/GENERATED_/" | sed "s/_START$//" | sort --unique > "${TEMPLATE_FOLDER}"token.db
 #    grep "CUSTOM_.*_START" "${TEMPLATE_FOLDER}"*.template "${R3_FOLDER}"*.js "${R3_SYSTEM_FOLDER}"*.js -R | sed "s/^.*CUSTOM_/CUSTOM_/" | sed "s/_START$//" | sort --unique >> "${TEMPLATE_FOLDER}"token.db
 
     CLASS_NAME=$ARG1
@@ -167,12 +167,12 @@ then
       perl -p -i -e 's/^const Utils.*\n$//' "${R3_FOLDER}${FILE_NAME}"
     fi
 
-    grep 'GENERATE_' < "${TEMPLATE_FOLDER}"token.db | sed "s/^.*GENERATE/GENERATE/" | while IFS= read -r TOKEN
+    grep 'GENERATED_' < "${TEMPLATE_FOLDER}"token.db | sed "s/^.*GENERATE/GENERATE/" | while IFS= read -r TOKEN
     do
 
       START_TOKEN="${TOKEN}_START"
       END_TOKEN="${TOKEN}_END"
-      TEMPLATE=$(echo "${TOKEN}.template" | sed "s/^GENERATE_//" | awk '{print tolower($0)}')
+      TEMPLATE=$(echo "${TOKEN}.template" | sed "s/^GENERATED_//" | awk '{print tolower($0)}')
 
       if grep -q "${START_TOKEN}" "${R3_FOLDER}${FILE_NAME}"; then
 
@@ -204,47 +204,22 @@ then
 
     echo "Created class ${R3_FOLDER}${FILE_NAME}"
 
-#    cd "${R3_V2_LIB_PATH}" 2>&1 || exit 3
-#
-#    ./r3.php "${R3_FOLDER}${FILE_NAME}" save
-#    RESULT=$?
-#    if [ "${RESULT}" = 1 ];
-#    then
-#      exit 5
-#    fi
-#
-#    ./r3.php "${R3_FOLDER}${FILE_NAME}" restore
-#    RESULT=$?
-#    if [ "${RESULT}" = 1 ];
-#    then
-#      exit 5
-#    fi
-#
-#    ./r3.php all build-dist
-#
-#    cd - 2>&1 || exit 3
-
     exit 0;
 fi
 
 if [ "${TASK}" = 'build-events' ];
 then
 
-    echo "building events"
+    echo "generating events"
 
     cd "${R3_V2_LIB_PATH}" 2>&1 || exit 3
 
-    ./build_events.php
+    ./r3.php all generate-events
 
     cd - 2>&1 || exit 3
 
-#    set -o xtrace
-
-    CONTENTS=$(cat "${R3_FOLDER}events-generated")
-    perl -i -pe "BEGIN{undef $/;} s/\/\/EVENT_GENERATED_START.*\/\/EVENT_GENERATED_END/\/\/EVENT_GENERATED_START\n${CONTENTS}\n\/\/EVENT_GENERATED_END/smg" "${R3_FOLDER}r3-event.js"
-    rm "${R3_FOLDER}events-generated"
-
     exit 0
+
 fi
 
 check_file_found() {
@@ -272,7 +247,7 @@ check_file_found() {
 if [ "${TASK}" = 'build-dist' ];
 then
 
-    echo "building graph"
+    echo "building distribution"
 
     cd "${R3_V2_LIB_PATH}" 2>&1 || exit 3
 
@@ -352,7 +327,11 @@ then
 
     done
 
-    echo "building graph"
+    echo "generating events"
+
+    ./r3.php all generate-events
+
+    echo "building distribution"
 
     ./r3.php all build-dist