Add option --without-cloop-generation

Good for builds not changing the original code, as the generated files are committed

Author: asfernandes

builds/posix/Makefile.in

@@ -135,6 +135,7 @@ RPL_AWK_SRC=$(MISC)/def_awk.c
 RPL_GREP=$(GEN_ROOT)/isc_grep
 RPL_GREP_SRC=$(MISC)/isc_grep.c
 
+ifeq ($(CLOOP_GENERATION_FLG),Y)
 updateCloopInterfaces : $(API_H_FILE) $(API_PAS_FILE) $(API_C_H_FILE)
 
 $(API_H_FILE): $(IDL_FILE)
@@ -185,6 +186,7 @@ $(API_PAS_FILE): $(IDL_FILE) $(PASCAL_SOURCES) $(TMP_FUNCS_PAS)
 	else \
 		rm -f $(API_PAS_TMP_FILE); \
 	fi
+endif
 
 updateBuildNum : $(SRC_ROOT)/jrd/build_no.h $(GEN_ROOT)/Make.Version
 
@@ -205,6 +207,7 @@ ifeq ($(CLIENT_ONLY_FLG),N)
 		PROGRAM=$(GEN_ROOT)/extern/btyacc/btyacc OBJ_DIR=$(ROOT)/temp/extern/btyacc
 endif
 
+ifeq ($(CLOOP_GENERATION_FLG),Y)
 	mkdir -p $(GEN_ROOT)/$(TARGET)/cloop
 
 ifeq ($(PLATFORM),DARWIN)
@@ -216,6 +219,7 @@ else
 endif
 	cd $(GEN_ROOT)/$(TARGET)/cloop && \
 	cmake --build .
+endif
 
 	mkdir -p $(ROOT)/temp/extern/decNumber $(GEN_ROOT)/extern/decNumber
 	CC="$(CC)" CFLAGS="$(CFLAGS)" AR="$(AR)" $(MAKE) -C $(SRCDIR)/extern/decNumber \
@@ -365,7 +369,9 @@ master_process:
 	$(MAKE) updateBuildNum
 	$(MAKE) export_lists
 	$(MAKE) external
+ifeq ($(CLOOP_GENERATION_FLG),Y)
 	$(MAKE) updateCloopInterfaces
+endif
 	$(MAKE) rest
 	$(MAKE) yvalve
 ifeq ($(CLIENT_ONLY_FLG),Y)
@@ -401,7 +407,9 @@ cross1:
 	$(MAKE) updateBuildNum
 	$(MAKE) export_lists
 	$(MAKE) external
+ifeq ($(CLOOP_GENERATION_FLG),Y)
 	$(MAKE) updateCloopInterfaces
+endif
 ifeq ($(CLIENT_ONLY_FLG),N)
 	$(MAKE) boot
 	$(MAKE) yvalve
@@ -522,7 +530,9 @@ client_static_process:
 	$(MAKE) updateBuildNum
 	$(MAKE) export_lists
 	$(MAKE) external
+ifeq ($(CLOOP_GENERATION_FLG),Y)
 	$(MAKE) updateCloopInterfaces
+endif
 	$(MAKE) rest
 	$(MAKE) $(LIBFIREBIRD_STATIC)
 	$(MAKE) include_generic
@@ -927,7 +937,9 @@ clean_vers:
 clean_misc:
 	$(RM) security.tmp test.header.txt
 	$(RM) $(TMP_FUNCS_PAS) $(RPL_AWK) $(RPL_GREP)
+ifeq ($(CLOOP_GENERATION_FLG),Y)
 	$(TOUCH) -c -t 200001010000 $(API_H_FILE) $(API_PAS_FILE)
+endif
 
 
 ifeq ($(EDITLINE_FLG),Y)

builds/posix/make.defaults

@@ -50,6 +50,7 @@ EXA_ROOT?=$(SRCDIR)/examples
 IsCross=@IS_CROSS@
 TOMMATH_BUILD_FLG=@TOMMATH_BUILD@
 TOMCRYPT_BUILD_FLG=@TOMCRYPT_BUILD@
+CLOOP_GENERATION_FLG=@CLOOP_GENERATION@
 RE2_BUILD_FLG=@RE2_BUILD@
 SYSTEM_BOOST_FLG=@SYSTEM_BOOST@
 

builds/win32/make_boot.bat

@@ -29,7 +29,7 @@ for %%v in ( alice auth burp dsql gpre isql jrd misc msgs examples yvalve utilit
 
 @mkdir %FB_BIN_DIR%\tzdata 2>nul
 
-call :interfaces
+@if not defined FBBUILD_WITHOUT_CLOOP_GENERATION call :interfaces
 if "!ERRLEV!"=="1" goto :END
 
 call :LibTom
@@ -205,6 +205,7 @@ goto :EOF
 ::===================
 :: Build CLOOP and generate interface headers
 :interfaces
+@if defined FBBUILD_WITHOUT_CLOOP_GENERATION goto :EOF
 @echo.
 @echo Building CLOOP and generating interfaces...
 @mkdir %FB_GEN_DIR%\%FB_TARGET_PLATFORM%\cloop 2>nul

builds/win32/run_all.bat

@@ -12,6 +12,7 @@ set FBBUILD_BUILD_ONLY=0
 set FBBUILD_KITS=ISX ZIP
 set FBBUILD_TEST_ONLY=
 set FBBUILD_WITHOUT_TOMCRYPT=
+set FBBUILD_WITHOUT_CLOOP_GENERATION=
 set FB2_SNAPSHOT=
 
 ::Check if on-line help is required
@@ -84,6 +85,8 @@ goto :END
 @echo.
 @echo    WITHOUT_TOMCRYPT - omit TomCrypt and ChaCha from CLIENT_ONLY=STATIC builds
 @echo.
+@echo    WITHOUT_CLOOP_GENERATION - omit Cloop build and interface generation
+@echo.
 @echo    REALCLEAN - Run CLEAN_ALL.BAT REALCLEAN
 @echo                This will do a deeper clean.
 @echo                Recommended for multi-platform builds

builds/win32/setenvvar.bat

@@ -31,6 +31,11 @@ if /I "%~1"=="WITHOUT_TOMCRYPT" (
   shift /1
   goto :parse_args
 )
+if /I "%~1"=="WITHOUT_CLOOP_GENERATION" (
+  set FBBUILD_WITHOUT_CLOOP_GENERATION=1
+  shift /1
+  goto :parse_args
+)
 if /I "%~1"=="CLEAN" (
   set FB_CLEAN=:rebuild
   shift /1
@@ -288,6 +293,7 @@ goto :END
 @echo    vs_ver=%VS_VER%
 @echo    FB_VSCOMNTOOLS=%FB_VSCOMNTOOLS%
 @echo    platform=%FB_TARGET_PLATFORM%
+@if defined FBBUILD_WITHOUT_CLOOP_GENERATION echo    without_cloop_generation=yes
 @if /I "%FB_CLIENT_ONLY%"=="STATIC" (
   @echo    fbclient_static_config=%FB_STATIC_CONFIG%
   @if defined FBBUILD_WITHOUT_TOMCRYPT echo    without_tomcrypt=yes

configure.ac

@@ -601,6 +601,16 @@ AC_ARG_WITH(tomcrypt,
    esac])
 AC_SUBST(WITH_TOMCRYPT)
 
+CLOOP_GENERATION=Y
+AC_ARG_WITH(cloop-generation,
+  [  --without-cloop-generation do not build cloop or update generated interface files (default=no)],
+  [case "$withval" in
+     yes) CLOOP_GENERATION=Y;;
+     no)  CLOOP_GENERATION=N;;
+     *)   AC_MSG_ERROR(bad value '${withval}' for --with-cloop-generation);;
+   esac])
+AC_SUBST(CLOOP_GENERATION)
+
 TOMCRYPT_BUILD=N
 AC_ARG_WITH(builtin-tomcrypt,
   [  --with-builtin-tomcrypt build libtomcrypt library from firebird tree],
@@ -1537,6 +1547,12 @@ echo           "                   Service name : $FB_SERVICE_NAME"
 echo           "                   Service port : $FB_SERVICE_PORT"
 
 echo           "                   GPRE modules : c_cxx.cpp$GPRE_LANGUAGE_MODULES"
+
+case $CLOOP_GENERATION in
+ Y)       echo "               Cloop generation : enabled";;
+ N)       echo "               Cloop generation : disabled";;
+esac
+
 echo
 
 echo           "                    Install Dir : $prefix"

doc/README.build.msvc.html

@@ -108,6 +108,7 @@ <h4>4.1.-Standard build</h4>
 <li>make_boot.bat [DEBUG] [CLEAN]</li>
 <li>make_all.bat [DEBUG] [CLEAN]</li>
 </ol>
+<li>To skip the Cloop build and generated interface updates, pass <code>WITHOUT_CLOOP_GENERATION</code> to <code>run_all.bat</code>.</li>
 </ol>
 <ul>
 <p>After the build finish, an output directory with the binaries is created below your firebird directory.</p>

doc/README.build.posix.html

@@ -359,6 +359,17 @@ <h2>
                     no
                 </td>
             </tr>
+            <tr>
+                <td class="code">
+                    --without-cloop-generation
+                </td>
+                <td>
+                    Do not build Cloop or update generated interface files
+                </td>
+                <td class="code">
+                    no
+                </td>
+            </tr>
             <tr>
                 <td class="code">
                     --enable-raw-devices