From 17fab24221cf84180221592b978174f9b4719a2a Mon Sep 17 00:00:00 2001 From: wsherman Date: Tue, 3 Jan 2023 16:26:12 -0800 Subject: [PATCH] * Reorganize packages/googleapi/ directory. Separate hand coded files to a new directory "src/base" (googlebase.pp, googleservice.pp, googleclient.pp) Move generated api files to a new directory "src/bindings" Move the the bindings generator program out of /examples to /generator Move the unit googlediscoverytopas.pp to /generator Fix paths in /generator/googleapiconv.lpi Regenerate Makefile (using fpcmake -w -Tall) Edit fpmake.pp - remove src path - add src/base path - add src/bindings path - fix bad path for unit googleadexchangebuyer.pp - do not include unit googlediscoverytopas.pp (commented out) (add this later if the generator is setup to be included in the build) --- packages/googleapi/Makefile | 385 ++---------------- packages/googleapi/fpmake.pp | 10 +- .../generator/googleapiconv.lpi | 10 +- .../{examples => }/generator/googleapiconv.pp | 0 .../googlediscoverytopas.pp | 0 .../googleapi/src/{ => base}/googlebase.pp | 0 .../googleapi/src/{ => base}/googleclient.pp | 0 .../googleapi/src/{ => base}/googleservice.pp | 0 .../googleacceleratedmobilepageurl.pp | 0 .../{ => bindings}/googleadexchangebuyer.pp | 0 .../{ => bindings}/googleadexchangebuyer2.pp | 0 .../{ => bindings}/googleadexchangeseller.pp | 0 .../src/{ => bindings}/googleadmin.pp | 0 .../src/{ => bindings}/googleadsense.pp | 0 .../src/{ => bindings}/googleadsensehost.pp | 0 .../src/{ => bindings}/googleanalytics.pp | 0 .../googleanalyticsreporting.pp | 0 .../{ => bindings}/googleandroidenterprise.pp | 0 .../{ => bindings}/googleandroidpublisher.pp | 0 .../src/{ => bindings}/googleappengine.pp | 0 .../src/{ => bindings}/googleappsactivity.pp | 0 .../src/{ => bindings}/googleappstate.pp | 0 .../src/{ => bindings}/googleaudit.pp | 0 .../src/{ => bindings}/googleautoscaler.pp | 0 .../src/{ => bindings}/googlebigquery.pp | 0 .../src/{ => bindings}/googleblogger.pp | 0 .../src/{ => bindings}/googlebooks.pp | 0 .../src/{ => bindings}/googlecalendar.pp | 0 .../src/{ => bindings}/googlecivicinfo.pp | 0 .../src/{ => bindings}/googleclassroom.pp | 0 .../src/{ => bindings}/googlecloudbilling.pp | 0 .../src/{ => bindings}/googlecloudbuild.pp | 0 .../src/{ => bindings}/googleclouddebugger.pp | 0 .../googleclouderrorreporting.pp | 0 .../{ => bindings}/googlecloudlatencytest.pp | 0 .../{ => bindings}/googlecloudmonitoring.pp | 0 .../googlecloudresourcemanager.pp | 0 .../src/{ => bindings}/googlecloudsearch.pp | 0 .../src/{ => bindings}/googlecloudtrace.pp | 0 .../{ => bindings}/googleclouduseraccounts.pp | 0 .../src/{ => bindings}/googlecompute.pp | 0 .../{ => bindings}/googlecomputeaccounts.pp | 0 .../{ => bindings}/googleconsumersurveys.pp | 0 .../src/{ => bindings}/googlecontainer.pp | 0 .../src/{ => bindings}/googlecontent.pp | 0 .../src/{ => bindings}/googlecoordinate.pp | 0 .../src/{ => bindings}/googlecustomsearch.pp | 0 .../src/{ => bindings}/googledataflow.pp | 0 .../src/{ => bindings}/googledataproc.pp | 0 .../src/{ => bindings}/googledatastore.pp | 0 .../{ => bindings}/googledeploymentmanager.pp | 0 .../src/{ => bindings}/googledfareporting.pp | 0 .../src/{ => bindings}/googlediscovery.pp | 0 .../googleapi/src/{ => bindings}/googledns.pp | 0 .../googledoubleclickbidmanager.pp | 0 .../{ => bindings}/googledoubleclicksearch.pp | 0 .../src/{ => bindings}/googledrive.pp | 0 .../src/{ => bindings}/googlefirebaserules.pp | 0 .../src/{ => bindings}/googlefitness.pp | 0 .../src/{ => bindings}/googlefreebase.pp | 0 .../src/{ => bindings}/googlefusiontables.pp | 0 .../src/{ => bindings}/googlegames.pp | 0 .../googlegamesconfiguration.pp | 0 .../{ => bindings}/googlegamesmanagement.pp | 0 .../googleapi/src/{ => bindings}/googlegan.pp | 0 .../src/{ => bindings}/googlegenomics.pp | 0 .../src/{ => bindings}/googlegmail.pp | 0 .../{ => bindings}/googlegroupsmigration.pp | 0 .../{ => bindings}/googlegroupssettings.pp | 0 .../googleapi/src/{ => bindings}/googleiam.pp | 0 .../{ => bindings}/googleidentitytoolkit.pp | 0 .../src/{ => bindings}/googlekgsearch.pp | 0 .../src/{ => bindings}/googlelicensing.pp | 0 .../src/{ => bindings}/googlelogging.pp | 0 .../src/{ => bindings}/googlemanager.pp | 0 .../src/{ => bindings}/googlemapsengine.pp | 0 .../src/{ => bindings}/googlemirror.pp | 0 .../src/{ => bindings}/googlemonitoring.pp | 0 .../src/{ => bindings}/googleoauth2.pp | 0 .../{ => bindings}/googlepagespeedonline.pp | 0 .../src/{ => bindings}/googlepartners.pp | 0 .../src/{ => bindings}/googlepeople.pp | 0 .../{ => bindings}/googleplaymoviespartner.pp | 0 .../src/{ => bindings}/googleplus.pp | 0 .../src/{ => bindings}/googleplusdomains.pp | 0 .../src/{ => bindings}/googleprediction.pp | 0 .../{ => bindings}/googleproximitybeacon.pp | 0 .../src/{ => bindings}/googlepubsub.pp | 0 .../src/{ => bindings}/googleqpxexpress.pp | 0 .../src/{ => bindings}/googlereplicapool.pp | 0 .../googlereplicapoolupdater.pp | 0 .../src/{ => bindings}/googlereseller.pp | 0 .../src/{ => bindings}/googleresourceviews.pp | 0 .../src/{ => bindings}/googleruntimeconfig.pp | 0 .../src/{ => bindings}/googlesafebrowsing.pp | 0 .../src/{ => bindings}/googlescript.pp | 0 .../{ => bindings}/googleserviceregistry.pp | 0 .../src/{ => bindings}/googlesheets.pp | 0 .../{ => bindings}/googlesiteverification.pp | 0 .../src/{ => bindings}/googlespectrum.pp | 0 .../src/{ => bindings}/googlesqladmin.pp | 0 .../src/{ => bindings}/googlestorage.pp | 0 .../{ => bindings}/googlestoragetransfer.pp | 0 .../src/{ => bindings}/googletagmanager.pp | 0 .../src/{ => bindings}/googletaskqueue.pp | 0 .../src/{ => bindings}/googletasks.pp | 0 .../src/{ => bindings}/googletoolresults.pp | 0 .../src/{ => bindings}/googletranslate.pp | 0 .../src/{ => bindings}/googleurlshortener.pp | 0 .../src/{ => bindings}/googlevision.pp | 0 .../src/{ => bindings}/googlewebfonts.pp | 0 .../src/{ => bindings}/googlewebmasters.pp | 0 .../src/{ => bindings}/googleyoutube.pp | 0 .../{ => bindings}/googleyoutubeanalytics.pp | 0 .../{ => bindings}/googleyoutubereporting.pp | 0 115 files changed, 43 insertions(+), 362 deletions(-) rename packages/googleapi/{examples => }/generator/googleapiconv.lpi (88%) rename packages/googleapi/{examples => }/generator/googleapiconv.pp (100%) rename packages/googleapi/{src => generator}/googlediscoverytopas.pp (100%) rename packages/googleapi/src/{ => base}/googlebase.pp (100%) rename packages/googleapi/src/{ => base}/googleclient.pp (100%) rename packages/googleapi/src/{ => base}/googleservice.pp (100%) rename packages/googleapi/src/{ => bindings}/googleacceleratedmobilepageurl.pp (100%) rename packages/googleapi/src/{ => bindings}/googleadexchangebuyer.pp (100%) rename packages/googleapi/src/{ => bindings}/googleadexchangebuyer2.pp (100%) rename packages/googleapi/src/{ => bindings}/googleadexchangeseller.pp (100%) rename packages/googleapi/src/{ => bindings}/googleadmin.pp (100%) rename packages/googleapi/src/{ => bindings}/googleadsense.pp (100%) rename packages/googleapi/src/{ => bindings}/googleadsensehost.pp (100%) rename packages/googleapi/src/{ => bindings}/googleanalytics.pp (100%) rename packages/googleapi/src/{ => bindings}/googleanalyticsreporting.pp (100%) rename packages/googleapi/src/{ => bindings}/googleandroidenterprise.pp (100%) rename packages/googleapi/src/{ => bindings}/googleandroidpublisher.pp (100%) rename packages/googleapi/src/{ => bindings}/googleappengine.pp (100%) rename packages/googleapi/src/{ => bindings}/googleappsactivity.pp (100%) rename packages/googleapi/src/{ => bindings}/googleappstate.pp (100%) rename packages/googleapi/src/{ => bindings}/googleaudit.pp (100%) rename packages/googleapi/src/{ => bindings}/googleautoscaler.pp (100%) rename packages/googleapi/src/{ => bindings}/googlebigquery.pp (100%) rename packages/googleapi/src/{ => bindings}/googleblogger.pp (100%) rename packages/googleapi/src/{ => bindings}/googlebooks.pp (100%) rename packages/googleapi/src/{ => bindings}/googlecalendar.pp (100%) rename packages/googleapi/src/{ => bindings}/googlecivicinfo.pp (100%) rename packages/googleapi/src/{ => bindings}/googleclassroom.pp (100%) rename packages/googleapi/src/{ => bindings}/googlecloudbilling.pp (100%) rename packages/googleapi/src/{ => bindings}/googlecloudbuild.pp (100%) rename packages/googleapi/src/{ => bindings}/googleclouddebugger.pp (100%) rename packages/googleapi/src/{ => bindings}/googleclouderrorreporting.pp (100%) rename packages/googleapi/src/{ => bindings}/googlecloudlatencytest.pp (100%) rename packages/googleapi/src/{ => bindings}/googlecloudmonitoring.pp (100%) rename packages/googleapi/src/{ => bindings}/googlecloudresourcemanager.pp (100%) rename packages/googleapi/src/{ => bindings}/googlecloudsearch.pp (100%) rename packages/googleapi/src/{ => bindings}/googlecloudtrace.pp (100%) rename packages/googleapi/src/{ => bindings}/googleclouduseraccounts.pp (100%) rename packages/googleapi/src/{ => bindings}/googlecompute.pp (100%) rename packages/googleapi/src/{ => bindings}/googlecomputeaccounts.pp (100%) rename packages/googleapi/src/{ => bindings}/googleconsumersurveys.pp (100%) rename packages/googleapi/src/{ => bindings}/googlecontainer.pp (100%) rename packages/googleapi/src/{ => bindings}/googlecontent.pp (100%) rename packages/googleapi/src/{ => bindings}/googlecoordinate.pp (100%) rename packages/googleapi/src/{ => bindings}/googlecustomsearch.pp (100%) rename packages/googleapi/src/{ => bindings}/googledataflow.pp (100%) rename packages/googleapi/src/{ => bindings}/googledataproc.pp (100%) rename packages/googleapi/src/{ => bindings}/googledatastore.pp (100%) rename packages/googleapi/src/{ => bindings}/googledeploymentmanager.pp (100%) rename packages/googleapi/src/{ => bindings}/googledfareporting.pp (100%) rename packages/googleapi/src/{ => bindings}/googlediscovery.pp (100%) rename packages/googleapi/src/{ => bindings}/googledns.pp (100%) rename packages/googleapi/src/{ => bindings}/googledoubleclickbidmanager.pp (100%) rename packages/googleapi/src/{ => bindings}/googledoubleclicksearch.pp (100%) rename packages/googleapi/src/{ => bindings}/googledrive.pp (100%) rename packages/googleapi/src/{ => bindings}/googlefirebaserules.pp (100%) rename packages/googleapi/src/{ => bindings}/googlefitness.pp (100%) rename packages/googleapi/src/{ => bindings}/googlefreebase.pp (100%) rename packages/googleapi/src/{ => bindings}/googlefusiontables.pp (100%) rename packages/googleapi/src/{ => bindings}/googlegames.pp (100%) rename packages/googleapi/src/{ => bindings}/googlegamesconfiguration.pp (100%) rename packages/googleapi/src/{ => bindings}/googlegamesmanagement.pp (100%) rename packages/googleapi/src/{ => bindings}/googlegan.pp (100%) rename packages/googleapi/src/{ => bindings}/googlegenomics.pp (100%) rename packages/googleapi/src/{ => bindings}/googlegmail.pp (100%) rename packages/googleapi/src/{ => bindings}/googlegroupsmigration.pp (100%) rename packages/googleapi/src/{ => bindings}/googlegroupssettings.pp (100%) rename packages/googleapi/src/{ => bindings}/googleiam.pp (100%) rename packages/googleapi/src/{ => bindings}/googleidentitytoolkit.pp (100%) rename packages/googleapi/src/{ => bindings}/googlekgsearch.pp (100%) rename packages/googleapi/src/{ => bindings}/googlelicensing.pp (100%) rename packages/googleapi/src/{ => bindings}/googlelogging.pp (100%) rename packages/googleapi/src/{ => bindings}/googlemanager.pp (100%) rename packages/googleapi/src/{ => bindings}/googlemapsengine.pp (100%) rename packages/googleapi/src/{ => bindings}/googlemirror.pp (100%) rename packages/googleapi/src/{ => bindings}/googlemonitoring.pp (100%) rename packages/googleapi/src/{ => bindings}/googleoauth2.pp (100%) rename packages/googleapi/src/{ => bindings}/googlepagespeedonline.pp (100%) rename packages/googleapi/src/{ => bindings}/googlepartners.pp (100%) rename packages/googleapi/src/{ => bindings}/googlepeople.pp (100%) rename packages/googleapi/src/{ => bindings}/googleplaymoviespartner.pp (100%) rename packages/googleapi/src/{ => bindings}/googleplus.pp (100%) rename packages/googleapi/src/{ => bindings}/googleplusdomains.pp (100%) rename packages/googleapi/src/{ => bindings}/googleprediction.pp (100%) rename packages/googleapi/src/{ => bindings}/googleproximitybeacon.pp (100%) rename packages/googleapi/src/{ => bindings}/googlepubsub.pp (100%) rename packages/googleapi/src/{ => bindings}/googleqpxexpress.pp (100%) rename packages/googleapi/src/{ => bindings}/googlereplicapool.pp (100%) rename packages/googleapi/src/{ => bindings}/googlereplicapoolupdater.pp (100%) rename packages/googleapi/src/{ => bindings}/googlereseller.pp (100%) rename packages/googleapi/src/{ => bindings}/googleresourceviews.pp (100%) rename packages/googleapi/src/{ => bindings}/googleruntimeconfig.pp (100%) rename packages/googleapi/src/{ => bindings}/googlesafebrowsing.pp (100%) rename packages/googleapi/src/{ => bindings}/googlescript.pp (100%) rename packages/googleapi/src/{ => bindings}/googleserviceregistry.pp (100%) rename packages/googleapi/src/{ => bindings}/googlesheets.pp (100%) rename packages/googleapi/src/{ => bindings}/googlesiteverification.pp (100%) rename packages/googleapi/src/{ => bindings}/googlespectrum.pp (100%) rename packages/googleapi/src/{ => bindings}/googlesqladmin.pp (100%) rename packages/googleapi/src/{ => bindings}/googlestorage.pp (100%) rename packages/googleapi/src/{ => bindings}/googlestoragetransfer.pp (100%) rename packages/googleapi/src/{ => bindings}/googletagmanager.pp (100%) rename packages/googleapi/src/{ => bindings}/googletaskqueue.pp (100%) rename packages/googleapi/src/{ => bindings}/googletasks.pp (100%) rename packages/googleapi/src/{ => bindings}/googletoolresults.pp (100%) rename packages/googleapi/src/{ => bindings}/googletranslate.pp (100%) rename packages/googleapi/src/{ => bindings}/googleurlshortener.pp (100%) rename packages/googleapi/src/{ => bindings}/googlevision.pp (100%) rename packages/googleapi/src/{ => bindings}/googlewebfonts.pp (100%) rename packages/googleapi/src/{ => bindings}/googlewebmasters.pp (100%) rename packages/googleapi/src/{ => bindings}/googleyoutube.pp (100%) rename packages/googleapi/src/{ => bindings}/googleyoutubeanalytics.pp (100%) rename packages/googleapi/src/{ => bindings}/googleyoutubereporting.pp (100%) diff --git a/packages/googleapi/Makefile b/packages/googleapi/Makefile index 27d4982d4d..39a49aea55 100644 --- a/packages/googleapi/Makefile +++ b/packages/googleapi/Makefile @@ -2,7 +2,7 @@ # Don't edit, this file is generated by FPCMake Version 2.0.0 # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macosclassic m68k-embedded m68k-sinclairql powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macosclassic powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-haiku x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-android x86_64-aros x86_64-dragonfly arm-linux arm-netbsd arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-freertos arm-ios powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android mips64-linux mips64el-linux jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-freebsd aarch64-darwin aarch64-win64 aarch64-embedded aarch64-android aarch64-ios wasm32-embedded wasm32-wasi sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded xtensa-linux xtensa-embedded xtensa-freertos z80-embedded z80-zxspectrum z80-msxdos z80-amstradcpc +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macosclassic m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macosclassic powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-haiku x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-android x86_64-aros x86_64-dragonfly arm-linux arm-netbsd arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-ios powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin aarch64-android aarch64-ios wasm-wasm sparc64-linux BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom msdos win16 atari @@ -58,7 +58,7 @@ SRCBATCHEXT=.bat endif endif ifdef COMSPEC -ifneq ($(filter $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) +ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) ifndef RUNBATCH RUNBATCH=$(COMSPEC) /C endif @@ -178,8 +178,6 @@ else ARCH=$(CPU_TARGET) endif endif -ifeq ($(FULL_TARGET),aarch64-embedded) -endif ifeq ($(FULL_TARGET),arm-embedded) ifeq ($(SUBARCH),) $(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv4t or SUBARCH=armv7m) must be defined) @@ -198,29 +196,11 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif -ifeq ($(FULL_TARGET),xtensa-embedded) -ifeq ($(SUBARCH),) -$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) -endif -override FPCOPT+=-Cp$(SUBARCH) -endif -ifeq ($(FULL_TARGET),xtensa-freertos) -ifeq ($(SUBARCH),) -$(error When compiling for xtensa-freertos, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) -endif -override FPCOPT+=-Cp$(SUBARCH) -endif -ifeq ($(FULL_TARGET),arm-freertos) -ifeq ($(SUBARCH),) -$(error When compiling for arm-freertos, a sub-architecture (e.g. SUBARCH=armv6m or SUBARCH=armv7em) must be defined) -endif -override FPCOPT+=-Cp$(SUBARCH) -endif -ifneq ($(filter $(OS_SOURCE),$(LIMIT83fs)),) +ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) else -ifneq ($(filter $(OS_TARGET),$(LIMIT83fs)),) +ifneq ($(findstring $(OS_TARGET),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) else TARGETSUFFIX=$(FULL_TARGET) @@ -231,11 +211,11 @@ ifneq ($(FULL_TARGET),$(FULL_SOURCE)) CROSSCOMPILE=1 endif ifeq ($(findstring makefile,$(MAKECMDGOALS)),) -ifeq ($(filter $(FULL_TARGET),$(MAKEFILETARGETS)),) +ifeq ($(findstring $(FULL_TARGET),$(MAKEFILETARGETS)),) $(error The Makefile doesn't support target $(FULL_TARGET), please run fpcmake first) endif endif -ifneq ($(filter $(OS_TARGET),$(BSDs)),) +ifneq ($(findstring $(OS_TARGET),$(BSDs)),) BSDhier=1 endif ifeq ($(OS_TARGET),linux) @@ -289,8 +269,8 @@ endif ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifneq ($(filter $(OS_TARGET),darwin iphonesim ios),) -ifneq ($(filter $(OS_SOURCE),darwin ios),) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim ios),) +ifneq ($(findstring $(OS_SOURCE),darwin ios),) DARWIN2DARWIN=1 endif endif @@ -367,11 +347,11 @@ ifdef REQUIRE_PACKAGESDIR override PACKAGESDIR+=$(REQUIRE_PACKAGESDIR) endif ifdef ZIPINSTALL -ifneq ($(filter $(OS_TARGET),$(UNIXs)),) +ifneq ($(findstring $(OS_TARGET),$(UNIXs)),) UNIXHier=1 endif else -ifneq ($(filter $(OS_SOURCE),$(UNIXs)),) +ifneq ($(findstring $(OS_SOURCE),$(UNIXs)),) UNIXHier=1 endif endif @@ -556,116 +536,12 @@ endif else CROSSBINDIR= endif -ifeq ($(OS_SOURCE),linux) -ifndef GCCLIBDIR -ifeq ($(CPU_TARGET),i386) -ifneq ($(filter x86_64,$(shell uname -a)),) -ifeq ($(BINUTILSPREFIX),) -GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) -else -CROSSGCCOPT=-m32 -endif -endif -endif -ifeq ($(CPU_TARGET),powerpc) -ifeq ($(BINUTILSPREFIX),) -GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) -else -CROSSGCCOPT=-m32 -endif -endif -ifeq ($(CPU_TARGET),powerpc64) -ifeq ($(BINUTILSPREFIX),) -GCCLIBDIR:=$(shell dirname `gcc -m64 -print-libgcc-file-name`) -else -CROSSGCCOPT=-m64 -endif -endif -ifeq ($(CPU_TARGET),sparc) -ifneq ($(filter sparc64,$(shell uname -a)),) -ifeq ($(BINUTILSPREFIX),) -GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) -else -CROSSGCCOPT=-m32 -endif -endif -endif -ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),) -ifeq ($(BINUTILSPREFIX),) -GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`) -else -CROSSGCCOPT=-mabi=64 -endif -endif -ifneq ($(filter $(CPU_TARGET),mips mipsel),) -ifeq ($(BINUTILSPREFIX),) -GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`) -else -CROSSGCCOPT=-mabi=32 -endif -endif -ifeq ($(BINUTILSPREFIX),) -ifeq ($(GCCLIBDIR),) -GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) -endif -else -ifeq ($(CROSSGCCOPT),) -CROSSGCCOPT=-g -endif -endif -endif -ifdef FPCFPMAKE -FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP) -ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET)) -FPCMAKEGCCLIBDIR:=$(GCCLIBDIR) -else -ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),) -FPCMAKE_CROSSGCCOPT=-m64 -else -ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),) -FPCMAKE_CROSSGCCOPT=-mabi=64 -else -ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),) -FPCMAKE_CROSSGCCOPT=-mabi=32 -else -ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64) -FPCMAKE_CROSSGCCOPT=-mabi=lp64 -else -ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32) -FPCMAKE_CROSSGCCOPT=-mabi=ilp32 -else -FPCMAKE_CROSSGCCOPT=-m32 -endif -endif -endif -endif -endif -FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) -endif -endif -ifndef FPCMAKEGCCLIBDIR -FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) -endif -ifndef GCCLIBDIR -CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH)))) -ifneq ($(CROSSGCC),) -GCCLIBDIR:=$(shell dirname `$(CROSSGCC) $(CROSSGCCOPT) -print-libgcc-file-name`) -endif -endif -endif -ifdef inUnix -ifeq ($(OS_SOURCE),netbsd) -OTHERLIBDIR:=/usr/pkg/lib -endif -export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR -endif BATCHEXT=.bat LOADEREXT=.as EXEEXT=.exe PPLEXT=.ppl PPUEXT=.ppu OEXT=.o -LTOEXT=.bc ASMEXT=.s SMARTEXT=.sl STATICLIBEXT=.a @@ -810,7 +686,7 @@ DEBUGSYMEXT=.xcoff SHORTSUFFIX=mac IMPORTLIBPREFIX=imp endif -ifneq ($(filter $(OS_TARGET),darwin iphonesim ios),) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim ios),) BATCHEXT=.sh EXEEXT= HASSHAREDLIB=1 @@ -860,11 +736,6 @@ STATICLIBPREFIX= STATICLIBEXT=.a SHORTSUFFIX=d16 endif -ifeq ($(OS_TARGET),msxdos) -STATICLIBPREFIX= -STATICLIBEXT=.a -SHORTSUFFIX=msd -endif ifeq ($(OS_TARGET),embedded) ifeq ($(CPU_TARGET),i8086) STATICLIBPREFIX= @@ -872,9 +743,6 @@ STATICLIBEXT=.a else EXEEXT=.bin endif -ifeq ($(CPU_TARGET),z80) -OEXT=.rel -endif SHORTSUFFIX=emb endif ifeq ($(OS_TARGET),win16) @@ -883,13 +751,7 @@ STATICLIBEXT=.a SHAREDLIBEXT=.dll SHORTSUFFIX=w16 endif -ifeq ($(OS_TARGET),zxspectrum) -OEXT=.rel -endif -ifeq ($(OS_TARGET),wasi) -EXEEXT=.wasm -endif -ifneq ($(filter $(OS_SOURCE),$(LIMIT83fs)),) +ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) ZIPCROSSPREFIX= @@ -1384,14 +1246,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),m68k-sinclairql) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifeq ($(FULL_TARGET),powerpc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1680,14 +1534,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),arm-freertos) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifeq ($(FULL_TARGET),arm-ios) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1784,22 +1630,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),mips64-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),mips64el-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifeq ($(FULL_TARGET),jvm-java) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1848,14 +1678,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),aarch64-freebsd) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifeq ($(FULL_TARGET),aarch64-darwin) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1864,22 +1686,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),aarch64-win64) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),aarch64-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifeq ($(FULL_TARGET),aarch64-android) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1896,15 +1702,7 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),wasm32-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),wasm32-wasi) +ifeq ($(FULL_TARGET),wasm-wasm) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 @@ -1920,94 +1718,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif -ifeq ($(FULL_TARGET),riscv32-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),riscv32-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),riscv64-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),riscv64-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),xtensa-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),xtensa-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),xtensa-freertos) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),z80-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),z80-zxspectrum) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),z80-msxdos) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif -ifeq ($(FULL_TARGET),z80-amstradcpc) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2253,9 +1963,9 @@ endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-XP$(BINUTILSPREFIX) -ifneq ($(RLINKPATH),) -override FPCOPT+=-Xr$(RLINKPATH) endif +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-Xr$(RLINKPATH) endif endif ifndef CROSSCOMPILE @@ -2339,43 +2049,16 @@ override COMPILER_UNITTARGETDIR=$(COMPILER_TARGETDIR) override UNITTARGETDIRPREFIX=$(TARGETDIRPREFIX) endif endif -ifdef SYSROOTPATH -override FPCOPT+=-XR$(SYSROOTPATH) -else -ifeq ($(OS_TARGET),$(OS_SOURCE)) -ifeq ($(OS_TARGET),darwin) -ifeq ($(CPU_TARGET),aarch64) -ifneq ($(wildcard /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk),) -override FPCOPT+=-XR/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk -endif -endif -endif -endif -endif ifdef CREATESHARED override FPCOPT+=-Cg endif -ifneq ($(filter $(OS_TARGET),dragonfly freebsd openbsd netbsd linux solaris),) -ifneq ($(filter $(CPU_TARGET),x86_64 mips mipsel mips64 mips64el riscv64 powerpc64),) +ifneq ($(findstring $(OS_TARGET),dragonfly freebsd openbsd netbsd linux solaris),) +ifneq ($(findstring $(CPU_TARGET),x86_64 mips mipsel),) override FPCOPT+=-Cg endif endif -ifneq ($(filter $(CPU_TARGET),z80),) -override FPCOPT+=-CX -XX -endif ifdef LINKSHARED endif -ifdef GCCLIBDIR -override FPCOPT+=-Fl$(GCCLIBDIR) -ifdef FPCMAKEGCCLIBDIR -override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR) -else -override FPCMAKEOPT+=-Fl$(GCCLIBDIR) -endif -endif -ifdef OTHERLIBDIR -override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR)) -endif ifdef OPT override FPCOPT+=$(OPT) endif @@ -2402,10 +2085,10 @@ ifdef ACROSSCOMPILE override FPCOPT+=$(CROSSOPT) endif override COMPILER:=$(strip $(FPC) $(FPCOPT)) -ifneq (,$(filter -sh,$(COMPILER))) +ifneq (,$(findstring -sh ,$(COMPILER))) UseEXECPPAS=1 endif -ifneq (,$(filter -s,$(COMPILER))) +ifneq (,$(findstring -s ,$(COMPILER))) ifeq ($(FULL_SOURCE),$(FULL_TARGET)) UseEXECPPAS=1 endif @@ -2432,15 +2115,13 @@ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPP endif ifdef INSTALLPPUFILES ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICLIBEXT)) -override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(subst $(PPUEXT),$(LTOEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) +override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) else -override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(subst $(PPUEXT),$(LTOEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) +override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) endif ifneq ($(UNITTARGETDIRPREFIX),) -override INSTALLPPUFILENAMES:=$(notdir $(INSTALLPPUFILES)) -override INSTALLPPULINKFILENAMES:=$(notdir $(INSTALLPPULINKFILES)) -override INSTALLPPUFILES=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPUFILENAMES)) -override INSTALLPPULINKFILES=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPULINKFILENAMES))) +override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES))) +override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES)))) endif override INSTALL_CREATEPACKAGEFPC=1 endif @@ -2595,14 +2276,12 @@ ifdef CLEAN_UNITS override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS)) endif ifdef CLEANPPUFILES -override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)) $(subst $(PPUEXT),$(LTOEXT),$(CLEANPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES))) +override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES))) ifdef DEBUGSYMEXT override CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEXT),$(CLEANPPUFILES)) endif -override CLEANPPUFILENAMES:=$(CLEANPPUFILES) -override CLEANPPUFILES=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUFILENAMES)) -override CLEANPPULINKFILENAMES:=$(CLEANPPULINKFILES) -override CLEANPPULINKFILES=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPULINKFILENAMES))) +override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUFILES)) +override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPULINKFILES))) endif fpc_clean: $(CLEANTARGET) ifdef CLEANEXEFILES @@ -2626,9 +2305,8 @@ endif ifdef LIB_NAME -$(DEL) $(LIB_NAME) $(LIB_FULLNAME) endif - -$(DEL) $(FPCMADE) *$(FULL_TARGET).fpm Package.fpc *$(ASMEXT) - -$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_script.res *_link.res - -$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT) + -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE) + -$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT) fpc_cleanall: $(CLEANTARGET) ifdef CLEANEXEFILES -$(DEL) $(CLEANEXEFILES) @@ -2649,14 +2327,13 @@ ifdef CLEAN_FILES endif -$(DELTREE) units -$(DELTREE) bin - -$(DEL) *$(OEXT) *$(LTOEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT) + -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT) ifneq ($(PPUEXT),.ppu) -$(DEL) *.o *.ppu *.a endif -$(DELTREE) *$(SMARTEXT) - -$(DEL) fpcmade.* Package.fpc *.fpm - -$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_script.res *_link.res - -$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT) + -$(DEL) fpcmade.* Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE) + -$(DEL) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT) ifdef AOUTEXT -$(DEL) *$(AOUTEXT) endif diff --git a/packages/googleapi/fpmake.pp b/packages/googleapi/fpmake.pp index 32cbad7918..9f15587b9b 100644 --- a/packages/googleapi/fpmake.pp +++ b/packages/googleapi/fpmake.pp @@ -38,14 +38,18 @@ begin P.Dependencies.Add('rtl-objpas'); P.Dependencies.Add('fcl-json'); P.Dependencies.Add('fcl-web'); - P.SourcePath.Add('src'); + P.SourcePath.Add('src/base'); + P.SourcePath.Add('src/bindings'); T:=P.Targets.AddUnit('googlebase.pp'); T:=P.Targets.AddUnit('googleclient.pp'); T:=P.Targets.AddUnit('googleservice.pp'); T.Dependencies.AddUnit('googleclient'); T.Dependencies.AddUnit('googlebase'); - T:=StdDep(P.Targets.AddUnit('googlediscoverytopas.pp')); - T:=StdDep(P.Targets.AddUnit('src/googleadexchangebuyer.pp')); + +// add this back later if we setup the generator to be included in the build +// T:=StdDep(P.Targets.AddUnit('googlediscoverytopas.pp')); + + T:=StdDep(P.Targets.AddUnit('googleadexchangebuyer.pp')); T:=StdDep(P.Targets.AddUnit('googleadexchangeseller.pp')); T:=StdDep(P.Targets.AddUnit('googleadmin.pp')); T:=StdDep(P.Targets.AddUnit('googleadsense.pp')); diff --git a/packages/googleapi/examples/generator/googleapiconv.lpi b/packages/googleapi/generator/googleapiconv.lpi similarity index 88% rename from packages/googleapi/examples/generator/googleapiconv.lpi rename to packages/googleapi/generator/googleapiconv.lpi index 95a79d4787..66a1964986 100644 --- a/packages/googleapi/examples/generator/googleapiconv.lpi +++ b/packages/googleapi/generator/googleapiconv.lpi @@ -40,19 +40,19 @@ - + - + - + - + @@ -64,7 +64,7 @@ - + diff --git a/packages/googleapi/examples/generator/googleapiconv.pp b/packages/googleapi/generator/googleapiconv.pp similarity index 100% rename from packages/googleapi/examples/generator/googleapiconv.pp rename to packages/googleapi/generator/googleapiconv.pp diff --git a/packages/googleapi/src/googlediscoverytopas.pp b/packages/googleapi/generator/googlediscoverytopas.pp similarity index 100% rename from packages/googleapi/src/googlediscoverytopas.pp rename to packages/googleapi/generator/googlediscoverytopas.pp diff --git a/packages/googleapi/src/googlebase.pp b/packages/googleapi/src/base/googlebase.pp similarity index 100% rename from packages/googleapi/src/googlebase.pp rename to packages/googleapi/src/base/googlebase.pp diff --git a/packages/googleapi/src/googleclient.pp b/packages/googleapi/src/base/googleclient.pp similarity index 100% rename from packages/googleapi/src/googleclient.pp rename to packages/googleapi/src/base/googleclient.pp diff --git a/packages/googleapi/src/googleservice.pp b/packages/googleapi/src/base/googleservice.pp similarity index 100% rename from packages/googleapi/src/googleservice.pp rename to packages/googleapi/src/base/googleservice.pp diff --git a/packages/googleapi/src/googleacceleratedmobilepageurl.pp b/packages/googleapi/src/bindings/googleacceleratedmobilepageurl.pp similarity index 100% rename from packages/googleapi/src/googleacceleratedmobilepageurl.pp rename to packages/googleapi/src/bindings/googleacceleratedmobilepageurl.pp diff --git a/packages/googleapi/src/googleadexchangebuyer.pp b/packages/googleapi/src/bindings/googleadexchangebuyer.pp similarity index 100% rename from packages/googleapi/src/googleadexchangebuyer.pp rename to packages/googleapi/src/bindings/googleadexchangebuyer.pp diff --git a/packages/googleapi/src/googleadexchangebuyer2.pp b/packages/googleapi/src/bindings/googleadexchangebuyer2.pp similarity index 100% rename from packages/googleapi/src/googleadexchangebuyer2.pp rename to packages/googleapi/src/bindings/googleadexchangebuyer2.pp diff --git a/packages/googleapi/src/googleadexchangeseller.pp b/packages/googleapi/src/bindings/googleadexchangeseller.pp similarity index 100% rename from packages/googleapi/src/googleadexchangeseller.pp rename to packages/googleapi/src/bindings/googleadexchangeseller.pp diff --git a/packages/googleapi/src/googleadmin.pp b/packages/googleapi/src/bindings/googleadmin.pp similarity index 100% rename from packages/googleapi/src/googleadmin.pp rename to packages/googleapi/src/bindings/googleadmin.pp diff --git a/packages/googleapi/src/googleadsense.pp b/packages/googleapi/src/bindings/googleadsense.pp similarity index 100% rename from packages/googleapi/src/googleadsense.pp rename to packages/googleapi/src/bindings/googleadsense.pp diff --git a/packages/googleapi/src/googleadsensehost.pp b/packages/googleapi/src/bindings/googleadsensehost.pp similarity index 100% rename from packages/googleapi/src/googleadsensehost.pp rename to packages/googleapi/src/bindings/googleadsensehost.pp diff --git a/packages/googleapi/src/googleanalytics.pp b/packages/googleapi/src/bindings/googleanalytics.pp similarity index 100% rename from packages/googleapi/src/googleanalytics.pp rename to packages/googleapi/src/bindings/googleanalytics.pp diff --git a/packages/googleapi/src/googleanalyticsreporting.pp b/packages/googleapi/src/bindings/googleanalyticsreporting.pp similarity index 100% rename from packages/googleapi/src/googleanalyticsreporting.pp rename to packages/googleapi/src/bindings/googleanalyticsreporting.pp diff --git a/packages/googleapi/src/googleandroidenterprise.pp b/packages/googleapi/src/bindings/googleandroidenterprise.pp similarity index 100% rename from packages/googleapi/src/googleandroidenterprise.pp rename to packages/googleapi/src/bindings/googleandroidenterprise.pp diff --git a/packages/googleapi/src/googleandroidpublisher.pp b/packages/googleapi/src/bindings/googleandroidpublisher.pp similarity index 100% rename from packages/googleapi/src/googleandroidpublisher.pp rename to packages/googleapi/src/bindings/googleandroidpublisher.pp diff --git a/packages/googleapi/src/googleappengine.pp b/packages/googleapi/src/bindings/googleappengine.pp similarity index 100% rename from packages/googleapi/src/googleappengine.pp rename to packages/googleapi/src/bindings/googleappengine.pp diff --git a/packages/googleapi/src/googleappsactivity.pp b/packages/googleapi/src/bindings/googleappsactivity.pp similarity index 100% rename from packages/googleapi/src/googleappsactivity.pp rename to packages/googleapi/src/bindings/googleappsactivity.pp diff --git a/packages/googleapi/src/googleappstate.pp b/packages/googleapi/src/bindings/googleappstate.pp similarity index 100% rename from packages/googleapi/src/googleappstate.pp rename to packages/googleapi/src/bindings/googleappstate.pp diff --git a/packages/googleapi/src/googleaudit.pp b/packages/googleapi/src/bindings/googleaudit.pp similarity index 100% rename from packages/googleapi/src/googleaudit.pp rename to packages/googleapi/src/bindings/googleaudit.pp diff --git a/packages/googleapi/src/googleautoscaler.pp b/packages/googleapi/src/bindings/googleautoscaler.pp similarity index 100% rename from packages/googleapi/src/googleautoscaler.pp rename to packages/googleapi/src/bindings/googleautoscaler.pp diff --git a/packages/googleapi/src/googlebigquery.pp b/packages/googleapi/src/bindings/googlebigquery.pp similarity index 100% rename from packages/googleapi/src/googlebigquery.pp rename to packages/googleapi/src/bindings/googlebigquery.pp diff --git a/packages/googleapi/src/googleblogger.pp b/packages/googleapi/src/bindings/googleblogger.pp similarity index 100% rename from packages/googleapi/src/googleblogger.pp rename to packages/googleapi/src/bindings/googleblogger.pp diff --git a/packages/googleapi/src/googlebooks.pp b/packages/googleapi/src/bindings/googlebooks.pp similarity index 100% rename from packages/googleapi/src/googlebooks.pp rename to packages/googleapi/src/bindings/googlebooks.pp diff --git a/packages/googleapi/src/googlecalendar.pp b/packages/googleapi/src/bindings/googlecalendar.pp similarity index 100% rename from packages/googleapi/src/googlecalendar.pp rename to packages/googleapi/src/bindings/googlecalendar.pp diff --git a/packages/googleapi/src/googlecivicinfo.pp b/packages/googleapi/src/bindings/googlecivicinfo.pp similarity index 100% rename from packages/googleapi/src/googlecivicinfo.pp rename to packages/googleapi/src/bindings/googlecivicinfo.pp diff --git a/packages/googleapi/src/googleclassroom.pp b/packages/googleapi/src/bindings/googleclassroom.pp similarity index 100% rename from packages/googleapi/src/googleclassroom.pp rename to packages/googleapi/src/bindings/googleclassroom.pp diff --git a/packages/googleapi/src/googlecloudbilling.pp b/packages/googleapi/src/bindings/googlecloudbilling.pp similarity index 100% rename from packages/googleapi/src/googlecloudbilling.pp rename to packages/googleapi/src/bindings/googlecloudbilling.pp diff --git a/packages/googleapi/src/googlecloudbuild.pp b/packages/googleapi/src/bindings/googlecloudbuild.pp similarity index 100% rename from packages/googleapi/src/googlecloudbuild.pp rename to packages/googleapi/src/bindings/googlecloudbuild.pp diff --git a/packages/googleapi/src/googleclouddebugger.pp b/packages/googleapi/src/bindings/googleclouddebugger.pp similarity index 100% rename from packages/googleapi/src/googleclouddebugger.pp rename to packages/googleapi/src/bindings/googleclouddebugger.pp diff --git a/packages/googleapi/src/googleclouderrorreporting.pp b/packages/googleapi/src/bindings/googleclouderrorreporting.pp similarity index 100% rename from packages/googleapi/src/googleclouderrorreporting.pp rename to packages/googleapi/src/bindings/googleclouderrorreporting.pp diff --git a/packages/googleapi/src/googlecloudlatencytest.pp b/packages/googleapi/src/bindings/googlecloudlatencytest.pp similarity index 100% rename from packages/googleapi/src/googlecloudlatencytest.pp rename to packages/googleapi/src/bindings/googlecloudlatencytest.pp diff --git a/packages/googleapi/src/googlecloudmonitoring.pp b/packages/googleapi/src/bindings/googlecloudmonitoring.pp similarity index 100% rename from packages/googleapi/src/googlecloudmonitoring.pp rename to packages/googleapi/src/bindings/googlecloudmonitoring.pp diff --git a/packages/googleapi/src/googlecloudresourcemanager.pp b/packages/googleapi/src/bindings/googlecloudresourcemanager.pp similarity index 100% rename from packages/googleapi/src/googlecloudresourcemanager.pp rename to packages/googleapi/src/bindings/googlecloudresourcemanager.pp diff --git a/packages/googleapi/src/googlecloudsearch.pp b/packages/googleapi/src/bindings/googlecloudsearch.pp similarity index 100% rename from packages/googleapi/src/googlecloudsearch.pp rename to packages/googleapi/src/bindings/googlecloudsearch.pp diff --git a/packages/googleapi/src/googlecloudtrace.pp b/packages/googleapi/src/bindings/googlecloudtrace.pp similarity index 100% rename from packages/googleapi/src/googlecloudtrace.pp rename to packages/googleapi/src/bindings/googlecloudtrace.pp diff --git a/packages/googleapi/src/googleclouduseraccounts.pp b/packages/googleapi/src/bindings/googleclouduseraccounts.pp similarity index 100% rename from packages/googleapi/src/googleclouduseraccounts.pp rename to packages/googleapi/src/bindings/googleclouduseraccounts.pp diff --git a/packages/googleapi/src/googlecompute.pp b/packages/googleapi/src/bindings/googlecompute.pp similarity index 100% rename from packages/googleapi/src/googlecompute.pp rename to packages/googleapi/src/bindings/googlecompute.pp diff --git a/packages/googleapi/src/googlecomputeaccounts.pp b/packages/googleapi/src/bindings/googlecomputeaccounts.pp similarity index 100% rename from packages/googleapi/src/googlecomputeaccounts.pp rename to packages/googleapi/src/bindings/googlecomputeaccounts.pp diff --git a/packages/googleapi/src/googleconsumersurveys.pp b/packages/googleapi/src/bindings/googleconsumersurveys.pp similarity index 100% rename from packages/googleapi/src/googleconsumersurveys.pp rename to packages/googleapi/src/bindings/googleconsumersurveys.pp diff --git a/packages/googleapi/src/googlecontainer.pp b/packages/googleapi/src/bindings/googlecontainer.pp similarity index 100% rename from packages/googleapi/src/googlecontainer.pp rename to packages/googleapi/src/bindings/googlecontainer.pp diff --git a/packages/googleapi/src/googlecontent.pp b/packages/googleapi/src/bindings/googlecontent.pp similarity index 100% rename from packages/googleapi/src/googlecontent.pp rename to packages/googleapi/src/bindings/googlecontent.pp diff --git a/packages/googleapi/src/googlecoordinate.pp b/packages/googleapi/src/bindings/googlecoordinate.pp similarity index 100% rename from packages/googleapi/src/googlecoordinate.pp rename to packages/googleapi/src/bindings/googlecoordinate.pp diff --git a/packages/googleapi/src/googlecustomsearch.pp b/packages/googleapi/src/bindings/googlecustomsearch.pp similarity index 100% rename from packages/googleapi/src/googlecustomsearch.pp rename to packages/googleapi/src/bindings/googlecustomsearch.pp diff --git a/packages/googleapi/src/googledataflow.pp b/packages/googleapi/src/bindings/googledataflow.pp similarity index 100% rename from packages/googleapi/src/googledataflow.pp rename to packages/googleapi/src/bindings/googledataflow.pp diff --git a/packages/googleapi/src/googledataproc.pp b/packages/googleapi/src/bindings/googledataproc.pp similarity index 100% rename from packages/googleapi/src/googledataproc.pp rename to packages/googleapi/src/bindings/googledataproc.pp diff --git a/packages/googleapi/src/googledatastore.pp b/packages/googleapi/src/bindings/googledatastore.pp similarity index 100% rename from packages/googleapi/src/googledatastore.pp rename to packages/googleapi/src/bindings/googledatastore.pp diff --git a/packages/googleapi/src/googledeploymentmanager.pp b/packages/googleapi/src/bindings/googledeploymentmanager.pp similarity index 100% rename from packages/googleapi/src/googledeploymentmanager.pp rename to packages/googleapi/src/bindings/googledeploymentmanager.pp diff --git a/packages/googleapi/src/googledfareporting.pp b/packages/googleapi/src/bindings/googledfareporting.pp similarity index 100% rename from packages/googleapi/src/googledfareporting.pp rename to packages/googleapi/src/bindings/googledfareporting.pp diff --git a/packages/googleapi/src/googlediscovery.pp b/packages/googleapi/src/bindings/googlediscovery.pp similarity index 100% rename from packages/googleapi/src/googlediscovery.pp rename to packages/googleapi/src/bindings/googlediscovery.pp diff --git a/packages/googleapi/src/googledns.pp b/packages/googleapi/src/bindings/googledns.pp similarity index 100% rename from packages/googleapi/src/googledns.pp rename to packages/googleapi/src/bindings/googledns.pp diff --git a/packages/googleapi/src/googledoubleclickbidmanager.pp b/packages/googleapi/src/bindings/googledoubleclickbidmanager.pp similarity index 100% rename from packages/googleapi/src/googledoubleclickbidmanager.pp rename to packages/googleapi/src/bindings/googledoubleclickbidmanager.pp diff --git a/packages/googleapi/src/googledoubleclicksearch.pp b/packages/googleapi/src/bindings/googledoubleclicksearch.pp similarity index 100% rename from packages/googleapi/src/googledoubleclicksearch.pp rename to packages/googleapi/src/bindings/googledoubleclicksearch.pp diff --git a/packages/googleapi/src/googledrive.pp b/packages/googleapi/src/bindings/googledrive.pp similarity index 100% rename from packages/googleapi/src/googledrive.pp rename to packages/googleapi/src/bindings/googledrive.pp diff --git a/packages/googleapi/src/googlefirebaserules.pp b/packages/googleapi/src/bindings/googlefirebaserules.pp similarity index 100% rename from packages/googleapi/src/googlefirebaserules.pp rename to packages/googleapi/src/bindings/googlefirebaserules.pp diff --git a/packages/googleapi/src/googlefitness.pp b/packages/googleapi/src/bindings/googlefitness.pp similarity index 100% rename from packages/googleapi/src/googlefitness.pp rename to packages/googleapi/src/bindings/googlefitness.pp diff --git a/packages/googleapi/src/googlefreebase.pp b/packages/googleapi/src/bindings/googlefreebase.pp similarity index 100% rename from packages/googleapi/src/googlefreebase.pp rename to packages/googleapi/src/bindings/googlefreebase.pp diff --git a/packages/googleapi/src/googlefusiontables.pp b/packages/googleapi/src/bindings/googlefusiontables.pp similarity index 100% rename from packages/googleapi/src/googlefusiontables.pp rename to packages/googleapi/src/bindings/googlefusiontables.pp diff --git a/packages/googleapi/src/googlegames.pp b/packages/googleapi/src/bindings/googlegames.pp similarity index 100% rename from packages/googleapi/src/googlegames.pp rename to packages/googleapi/src/bindings/googlegames.pp diff --git a/packages/googleapi/src/googlegamesconfiguration.pp b/packages/googleapi/src/bindings/googlegamesconfiguration.pp similarity index 100% rename from packages/googleapi/src/googlegamesconfiguration.pp rename to packages/googleapi/src/bindings/googlegamesconfiguration.pp diff --git a/packages/googleapi/src/googlegamesmanagement.pp b/packages/googleapi/src/bindings/googlegamesmanagement.pp similarity index 100% rename from packages/googleapi/src/googlegamesmanagement.pp rename to packages/googleapi/src/bindings/googlegamesmanagement.pp diff --git a/packages/googleapi/src/googlegan.pp b/packages/googleapi/src/bindings/googlegan.pp similarity index 100% rename from packages/googleapi/src/googlegan.pp rename to packages/googleapi/src/bindings/googlegan.pp diff --git a/packages/googleapi/src/googlegenomics.pp b/packages/googleapi/src/bindings/googlegenomics.pp similarity index 100% rename from packages/googleapi/src/googlegenomics.pp rename to packages/googleapi/src/bindings/googlegenomics.pp diff --git a/packages/googleapi/src/googlegmail.pp b/packages/googleapi/src/bindings/googlegmail.pp similarity index 100% rename from packages/googleapi/src/googlegmail.pp rename to packages/googleapi/src/bindings/googlegmail.pp diff --git a/packages/googleapi/src/googlegroupsmigration.pp b/packages/googleapi/src/bindings/googlegroupsmigration.pp similarity index 100% rename from packages/googleapi/src/googlegroupsmigration.pp rename to packages/googleapi/src/bindings/googlegroupsmigration.pp diff --git a/packages/googleapi/src/googlegroupssettings.pp b/packages/googleapi/src/bindings/googlegroupssettings.pp similarity index 100% rename from packages/googleapi/src/googlegroupssettings.pp rename to packages/googleapi/src/bindings/googlegroupssettings.pp diff --git a/packages/googleapi/src/googleiam.pp b/packages/googleapi/src/bindings/googleiam.pp similarity index 100% rename from packages/googleapi/src/googleiam.pp rename to packages/googleapi/src/bindings/googleiam.pp diff --git a/packages/googleapi/src/googleidentitytoolkit.pp b/packages/googleapi/src/bindings/googleidentitytoolkit.pp similarity index 100% rename from packages/googleapi/src/googleidentitytoolkit.pp rename to packages/googleapi/src/bindings/googleidentitytoolkit.pp diff --git a/packages/googleapi/src/googlekgsearch.pp b/packages/googleapi/src/bindings/googlekgsearch.pp similarity index 100% rename from packages/googleapi/src/googlekgsearch.pp rename to packages/googleapi/src/bindings/googlekgsearch.pp diff --git a/packages/googleapi/src/googlelicensing.pp b/packages/googleapi/src/bindings/googlelicensing.pp similarity index 100% rename from packages/googleapi/src/googlelicensing.pp rename to packages/googleapi/src/bindings/googlelicensing.pp diff --git a/packages/googleapi/src/googlelogging.pp b/packages/googleapi/src/bindings/googlelogging.pp similarity index 100% rename from packages/googleapi/src/googlelogging.pp rename to packages/googleapi/src/bindings/googlelogging.pp diff --git a/packages/googleapi/src/googlemanager.pp b/packages/googleapi/src/bindings/googlemanager.pp similarity index 100% rename from packages/googleapi/src/googlemanager.pp rename to packages/googleapi/src/bindings/googlemanager.pp diff --git a/packages/googleapi/src/googlemapsengine.pp b/packages/googleapi/src/bindings/googlemapsengine.pp similarity index 100% rename from packages/googleapi/src/googlemapsengine.pp rename to packages/googleapi/src/bindings/googlemapsengine.pp diff --git a/packages/googleapi/src/googlemirror.pp b/packages/googleapi/src/bindings/googlemirror.pp similarity index 100% rename from packages/googleapi/src/googlemirror.pp rename to packages/googleapi/src/bindings/googlemirror.pp diff --git a/packages/googleapi/src/googlemonitoring.pp b/packages/googleapi/src/bindings/googlemonitoring.pp similarity index 100% rename from packages/googleapi/src/googlemonitoring.pp rename to packages/googleapi/src/bindings/googlemonitoring.pp diff --git a/packages/googleapi/src/googleoauth2.pp b/packages/googleapi/src/bindings/googleoauth2.pp similarity index 100% rename from packages/googleapi/src/googleoauth2.pp rename to packages/googleapi/src/bindings/googleoauth2.pp diff --git a/packages/googleapi/src/googlepagespeedonline.pp b/packages/googleapi/src/bindings/googlepagespeedonline.pp similarity index 100% rename from packages/googleapi/src/googlepagespeedonline.pp rename to packages/googleapi/src/bindings/googlepagespeedonline.pp diff --git a/packages/googleapi/src/googlepartners.pp b/packages/googleapi/src/bindings/googlepartners.pp similarity index 100% rename from packages/googleapi/src/googlepartners.pp rename to packages/googleapi/src/bindings/googlepartners.pp diff --git a/packages/googleapi/src/googlepeople.pp b/packages/googleapi/src/bindings/googlepeople.pp similarity index 100% rename from packages/googleapi/src/googlepeople.pp rename to packages/googleapi/src/bindings/googlepeople.pp diff --git a/packages/googleapi/src/googleplaymoviespartner.pp b/packages/googleapi/src/bindings/googleplaymoviespartner.pp similarity index 100% rename from packages/googleapi/src/googleplaymoviespartner.pp rename to packages/googleapi/src/bindings/googleplaymoviespartner.pp diff --git a/packages/googleapi/src/googleplus.pp b/packages/googleapi/src/bindings/googleplus.pp similarity index 100% rename from packages/googleapi/src/googleplus.pp rename to packages/googleapi/src/bindings/googleplus.pp diff --git a/packages/googleapi/src/googleplusdomains.pp b/packages/googleapi/src/bindings/googleplusdomains.pp similarity index 100% rename from packages/googleapi/src/googleplusdomains.pp rename to packages/googleapi/src/bindings/googleplusdomains.pp diff --git a/packages/googleapi/src/googleprediction.pp b/packages/googleapi/src/bindings/googleprediction.pp similarity index 100% rename from packages/googleapi/src/googleprediction.pp rename to packages/googleapi/src/bindings/googleprediction.pp diff --git a/packages/googleapi/src/googleproximitybeacon.pp b/packages/googleapi/src/bindings/googleproximitybeacon.pp similarity index 100% rename from packages/googleapi/src/googleproximitybeacon.pp rename to packages/googleapi/src/bindings/googleproximitybeacon.pp diff --git a/packages/googleapi/src/googlepubsub.pp b/packages/googleapi/src/bindings/googlepubsub.pp similarity index 100% rename from packages/googleapi/src/googlepubsub.pp rename to packages/googleapi/src/bindings/googlepubsub.pp diff --git a/packages/googleapi/src/googleqpxexpress.pp b/packages/googleapi/src/bindings/googleqpxexpress.pp similarity index 100% rename from packages/googleapi/src/googleqpxexpress.pp rename to packages/googleapi/src/bindings/googleqpxexpress.pp diff --git a/packages/googleapi/src/googlereplicapool.pp b/packages/googleapi/src/bindings/googlereplicapool.pp similarity index 100% rename from packages/googleapi/src/googlereplicapool.pp rename to packages/googleapi/src/bindings/googlereplicapool.pp diff --git a/packages/googleapi/src/googlereplicapoolupdater.pp b/packages/googleapi/src/bindings/googlereplicapoolupdater.pp similarity index 100% rename from packages/googleapi/src/googlereplicapoolupdater.pp rename to packages/googleapi/src/bindings/googlereplicapoolupdater.pp diff --git a/packages/googleapi/src/googlereseller.pp b/packages/googleapi/src/bindings/googlereseller.pp similarity index 100% rename from packages/googleapi/src/googlereseller.pp rename to packages/googleapi/src/bindings/googlereseller.pp diff --git a/packages/googleapi/src/googleresourceviews.pp b/packages/googleapi/src/bindings/googleresourceviews.pp similarity index 100% rename from packages/googleapi/src/googleresourceviews.pp rename to packages/googleapi/src/bindings/googleresourceviews.pp diff --git a/packages/googleapi/src/googleruntimeconfig.pp b/packages/googleapi/src/bindings/googleruntimeconfig.pp similarity index 100% rename from packages/googleapi/src/googleruntimeconfig.pp rename to packages/googleapi/src/bindings/googleruntimeconfig.pp diff --git a/packages/googleapi/src/googlesafebrowsing.pp b/packages/googleapi/src/bindings/googlesafebrowsing.pp similarity index 100% rename from packages/googleapi/src/googlesafebrowsing.pp rename to packages/googleapi/src/bindings/googlesafebrowsing.pp diff --git a/packages/googleapi/src/googlescript.pp b/packages/googleapi/src/bindings/googlescript.pp similarity index 100% rename from packages/googleapi/src/googlescript.pp rename to packages/googleapi/src/bindings/googlescript.pp diff --git a/packages/googleapi/src/googleserviceregistry.pp b/packages/googleapi/src/bindings/googleserviceregistry.pp similarity index 100% rename from packages/googleapi/src/googleserviceregistry.pp rename to packages/googleapi/src/bindings/googleserviceregistry.pp diff --git a/packages/googleapi/src/googlesheets.pp b/packages/googleapi/src/bindings/googlesheets.pp similarity index 100% rename from packages/googleapi/src/googlesheets.pp rename to packages/googleapi/src/bindings/googlesheets.pp diff --git a/packages/googleapi/src/googlesiteverification.pp b/packages/googleapi/src/bindings/googlesiteverification.pp similarity index 100% rename from packages/googleapi/src/googlesiteverification.pp rename to packages/googleapi/src/bindings/googlesiteverification.pp diff --git a/packages/googleapi/src/googlespectrum.pp b/packages/googleapi/src/bindings/googlespectrum.pp similarity index 100% rename from packages/googleapi/src/googlespectrum.pp rename to packages/googleapi/src/bindings/googlespectrum.pp diff --git a/packages/googleapi/src/googlesqladmin.pp b/packages/googleapi/src/bindings/googlesqladmin.pp similarity index 100% rename from packages/googleapi/src/googlesqladmin.pp rename to packages/googleapi/src/bindings/googlesqladmin.pp diff --git a/packages/googleapi/src/googlestorage.pp b/packages/googleapi/src/bindings/googlestorage.pp similarity index 100% rename from packages/googleapi/src/googlestorage.pp rename to packages/googleapi/src/bindings/googlestorage.pp diff --git a/packages/googleapi/src/googlestoragetransfer.pp b/packages/googleapi/src/bindings/googlestoragetransfer.pp similarity index 100% rename from packages/googleapi/src/googlestoragetransfer.pp rename to packages/googleapi/src/bindings/googlestoragetransfer.pp diff --git a/packages/googleapi/src/googletagmanager.pp b/packages/googleapi/src/bindings/googletagmanager.pp similarity index 100% rename from packages/googleapi/src/googletagmanager.pp rename to packages/googleapi/src/bindings/googletagmanager.pp diff --git a/packages/googleapi/src/googletaskqueue.pp b/packages/googleapi/src/bindings/googletaskqueue.pp similarity index 100% rename from packages/googleapi/src/googletaskqueue.pp rename to packages/googleapi/src/bindings/googletaskqueue.pp diff --git a/packages/googleapi/src/googletasks.pp b/packages/googleapi/src/bindings/googletasks.pp similarity index 100% rename from packages/googleapi/src/googletasks.pp rename to packages/googleapi/src/bindings/googletasks.pp diff --git a/packages/googleapi/src/googletoolresults.pp b/packages/googleapi/src/bindings/googletoolresults.pp similarity index 100% rename from packages/googleapi/src/googletoolresults.pp rename to packages/googleapi/src/bindings/googletoolresults.pp diff --git a/packages/googleapi/src/googletranslate.pp b/packages/googleapi/src/bindings/googletranslate.pp similarity index 100% rename from packages/googleapi/src/googletranslate.pp rename to packages/googleapi/src/bindings/googletranslate.pp diff --git a/packages/googleapi/src/googleurlshortener.pp b/packages/googleapi/src/bindings/googleurlshortener.pp similarity index 100% rename from packages/googleapi/src/googleurlshortener.pp rename to packages/googleapi/src/bindings/googleurlshortener.pp diff --git a/packages/googleapi/src/googlevision.pp b/packages/googleapi/src/bindings/googlevision.pp similarity index 100% rename from packages/googleapi/src/googlevision.pp rename to packages/googleapi/src/bindings/googlevision.pp diff --git a/packages/googleapi/src/googlewebfonts.pp b/packages/googleapi/src/bindings/googlewebfonts.pp similarity index 100% rename from packages/googleapi/src/googlewebfonts.pp rename to packages/googleapi/src/bindings/googlewebfonts.pp diff --git a/packages/googleapi/src/googlewebmasters.pp b/packages/googleapi/src/bindings/googlewebmasters.pp similarity index 100% rename from packages/googleapi/src/googlewebmasters.pp rename to packages/googleapi/src/bindings/googlewebmasters.pp diff --git a/packages/googleapi/src/googleyoutube.pp b/packages/googleapi/src/bindings/googleyoutube.pp similarity index 100% rename from packages/googleapi/src/googleyoutube.pp rename to packages/googleapi/src/bindings/googleyoutube.pp diff --git a/packages/googleapi/src/googleyoutubeanalytics.pp b/packages/googleapi/src/bindings/googleyoutubeanalytics.pp similarity index 100% rename from packages/googleapi/src/googleyoutubeanalytics.pp rename to packages/googleapi/src/bindings/googleyoutubeanalytics.pp diff --git a/packages/googleapi/src/googleyoutubereporting.pp b/packages/googleapi/src/bindings/googleyoutubereporting.pp similarity index 100% rename from packages/googleapi/src/googleyoutubereporting.pp rename to packages/googleapi/src/bindings/googleyoutubereporting.pp