Backport feature #8273 - Reorganize public headers.

Merge branch 'work/public-headers-v5' into v5.0-release

Author: asfernandes

builds/install/arch-specific/solaris/CS/prototype.in

@@ -38,7 +38,6 @@ s none /usr/lib/libfbclient.so.2=@prefix@/lib/libfbclient.so.2
 
 d none @prefix@/include 0751 firebird firebird
 f none @prefix@/include/ib_util.h=$SRCDIR/include/ib_util.h 0444 firebird firebird
-f none @prefix@/include/perf.h=$SRCDIR/include/perf.h 0444 firebird firebird
 f none @prefix@/include/iberror.h=$SRCDIR/include/iberror.h 0444 firebird firebird
 f none @prefix@/include/ibase.h=$SRCDIR/include/ibase.h 0444 firebird firebird
 

builds/install/arch-specific/solaris/SS/prototype.in

@@ -38,7 +38,6 @@ s none /usr/lib/libfbclient.so.2=@prefix@/lib/libfbclient.so.2
 
 d none @prefix@/include 0755 firebird firebird
 f none @prefix@/include/ib_util.h=$SRCDIR/include/ib_util.h 0644 firebird firebird
-f none @prefix@/include/perf.h=$SRCDIR/include/perf.h 0644 firebird firebird
 f none @prefix@/include/iberror.h=$SRCDIR/include/iberror.h 0644 firebird firebird
 f none @prefix@/include/ibase.h=$SRCDIR/include/ibase.h 0644 firebird firebird
 

builds/install/arch-specific/solx86gcc/CS/prototype.in

@@ -108,7 +108,6 @@ f none @prefix@/include/blr.h=$SRCDIR/include/blr.h  0644 root root
 f none @prefix@/include/ib_util.h=$SRCDIR/include/ib_util.h  0644 root root
 f none @prefix@/include/ibase.h=$SRCDIR/include/ibase.h  0644 root root
 f none @prefix@/include/iberror.h=$SRCDIR/include/iberror.h  0644 root root
-f none @prefix@/include/perf.h=$SRCDIR/include/perf.h  0644 root root
 
 d none @prefix@/intl  0755 root root
 f none @prefix@/intl/libfbintl.so=$SRCDIR/intl/libfbintl.so  0755 root root

builds/install/arch-specific/win32/BuildExecutableInstall.bat

@@ -397,12 +397,10 @@ for %%v in (IPLicense.txt IDPLicense.txt ) do (
 :: grab some missing bits'n'pieces from different parts of the source tree
 ::=========================================================================
 @echo   Copying ib_util etc
-@copy %FB_ROOT_PATH%\src\extlib\ib_util.h %FB_OUTPUT_DIR%\include > nul || (call :ERROR Copying ib_util.h failed. & goto :EOF )
 @copy %FB_ROOT_PATH%\src\misc\pascal\ib_util.pas %FB_OUTPUT_DIR%\include > nul || (call :ERROR Copying ib_util.pas failed. & goto :EOF )
 
 @echo   Copying other include files required for development...
 @set OUTPATH=%FB_OUTPUT_DIR%\include
-@copy %FB_ROOT_PATH%\src\yvalve\perf.h %OUTPATH%\ > nul
 @copy %FB_ROOT_PATH%\src\include\gen\firebird.pas %OUTPATH%\firebird\ > nul || (@call :ERROR Failure executing copy %FB_ROOT_PATH%\src\include\gen\firebird.pas %OUTPATH%\firebird\  )
 @if ERRORLEVEL 1 goto :END
 

builds/posix/Makefile.in

@@ -740,20 +740,13 @@ gbak_files: $(GBAK_FILES)
 
 INCLUDE_DEST=   $(FB_BUILD)/include
 
-NEW_INCLUDES_SRC = $(shell find $(SRC_ROOT)/include/firebird -type f)
-NEW_INCLUDES_DEST = $(patsubst $(SRC_ROOT)/include/firebird/%, $(INCLUDE_DEST)/firebird/%, $(NEW_INCLUDES_SRC))
-
-include_generic: $(INCLUDE_DEST)/ib_util.h  \
-                 $(NEW_INCLUDES_DEST)
-
 # ib_util.h actually is a marker for a number of headers
 
 # Copy all the other headers to the distribution directory. We use
 # ib_util.h as the marker for all the files.
 
-OtherDistribHeaders = extlib/ib_util.h \
-                      yvalve/perf.h  \
-                      include/iberror.h \
+OtherDistribHeaders = include/ib_util.h \
+					  include/iberror.h \
 					  include/ibase.h
 
 SRC_OtherDistribHeaders = $(addprefix $(SRC_ROOT)/, $(OtherDistribHeaders))
@@ -762,6 +755,11 @@ $(INCLUDE_DEST)/ib_util.h : $(SRC_OtherDistribHeaders)
 	mkdir -p $(INCLUDE_DEST)
 	$(CP) $^ $(INCLUDE_DEST)/
 
+NEW_INCLUDES_SRC = $(shell find $(SRC_ROOT)/include/firebird -type f)
+NEW_INCLUDES_DEST = $(patsubst $(SRC_ROOT)/include/firebird/%, $(INCLUDE_DEST)/firebird/%, $(NEW_INCLUDES_SRC))
+
+include_generic: $(NEW_INCLUDES_DEST) $(INCLUDE_DEST)/ib_util.h
+
 ifeq ($(SYSTEM_BOOST_FLG),Y)
 $(INCLUDE_DEST)/firebird/Message.h : $(SRC_ROOT)/include/firebird/Message.h
 	sed 's,^#include "\./impl/boost/\(.\+\)",#include <boost/\1>,; s/\bFB_BOOST_PP_/BOOST_PP_/g' $< > $@

builds/win32/make_all.bat

@@ -96,8 +96,6 @@ for %%v in (gpre_boot build_msg common_test engine_test) do (
 )
 
 :: Headers
-copy %FB_ROOT_PATH%\src\extlib\ib_util.h %FB_OUTPUT_DIR%\include > nul
-copy %FB_ROOT_PATH%\src\jrd\perf.h %FB_OUTPUT_DIR%\include >nul
 copy %FB_ROOT_PATH%\src\include\ibase.h %FB_OUTPUT_DIR%\include > nul
 copy %FB_ROOT_PATH%\src\include\iberror.h %FB_OUTPUT_DIR%\include > nul
 copy %FB_GEN_DIR%\iberror_c.h %FB_OUTPUT_DIR%\include\firebird\impl > nul

builds/win32/msvc15/ib_util.vcxproj

@@ -192,9 +192,6 @@
   <ItemGroup>
     <ClCompile Include="..\..\..\src\extlib\ib_util.cpp" />
   </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\src\extlib\ib_util.h" />
-  </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\..\src\jrd\version.rc">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\src\jrd</AdditionalIncludeDirectories>
@@ -209,4 +206,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

builds/win32/msvc15/ib_util.vcxproj.filters

@@ -18,11 +18,6 @@
       <Filter>EXTLIB files</Filter>
     </ClCompile>
   </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\src\extlib\ib_util.h">
-      <Filter>Header files</Filter>
-    </ClInclude>
-  </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\..\src\jrd\version.rc">
       <Filter>Resource files</Filter>
@@ -31,4 +26,4 @@
   <ItemGroup>
     <None Include="..\defs\ib_util.def" />
   </ItemGroup>
-</Project>
+</Project>

examples/udf/udflib.c

@@ -35,9 +35,9 @@
 #endif
 #include <string.h>
 #include <math.h>
-#include <ibase.h>
+#include "firebird/ibase.h"
 #include "example.h"
-#include "ib_util.h"
+#include "firebird/ib_util.h"
 
 #define BADVAL -9999L
 #define MYBUF_LEN 15		/* number of chars to get for */

src/CMakeLists.txt

@@ -527,7 +527,7 @@ set_output_directory        (intl intl)
 # SHARED LIBRARY ib_util
 ########################################
 
-add_library                 (ib_util SHARED extlib/ib_util.cpp extlib/ib_util.h ${VERSION_RC})
+add_library                 (ib_util SHARED extlib/ib_util.cpp ${VERSION_RC})
 set_exported_symbols        (ib_util ib_util)
 set_output_directory_unix   (ib_util lib)
 
@@ -904,9 +904,7 @@ add_custom_target(copy_files
     COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/examples/stat ${output_dir}/examples/stat
     COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/examples/functions.c ${output_dir}/examples/functions.c
     # headers
-    COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/src/extlib/ib_util.h ${output_dir}/include/ib_util.h
     COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/src/include/gen/iberror.h ${output_dir}/include/iberror.h
-    COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/src/yvalve/perf.h ${output_dir}/include/perf.h
 )
 add_dependencies_cc     (copy_files databases)
 add_dependencies_unix_cc(copy_files makeHeader)

src/extlib/ib_util.h renamed to src/include/firebird/ib_util.h

@@ -21,17 +21,17 @@
  * Contributor(s): ______________________________________.
  */
 
-#ifndef _IB_UTIL_H
-#define _IB_UTIL_H
+#ifndef FIREBIRD_IB_UTIL_H
+#define FIREBIRD_IB_UTIL_H
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-extern void *ib_util_malloc(long);
+extern void* ib_util_malloc(long);
 
 #ifdef __cplusplus
 }	/* extern "C" */
 #endif
 
-#endif /* _IB_UTIL_H */
+#endif /* FIREBIRD_IB_UTIL_H */