# This is a sample BBI Config File for the Friendly Greeting System # (FGS) Product. # #----------------------------------------------------------------------------- NAME=FGS_Streams VERSION=3.6.0 #----------------------------------------------------------------------------- # Baseline Definition #----------------------------------------------------------------------------- BASELINE_STORAGE=$P4BBI_BASELINES BASELINE|FGS-1.0|FGS-1.0.tar.gz|RMTOP BASELINE|FGS-1.1|FGS-1.1.zip|RMTOP BASELINE|FGS-1.1.p1|FGS-1.1.p1 BASELINE|FGS-1.1.p2|FGS-1.1.p2 BASELINE|FGS-1.1.p2-to-MAIN-MergeResult|FGS-1.1.p2-to-MAIN-MergeResult BASELINE|FGS-1.1.p3|FGS-1.1.p3 BASELINE|FGS-2.0-Dev|FGS-2.0-Dev.tgz BASELINE|FGS-2.0.1-Dev_docs|FGS-2.0.1-Dev_docs.tgz BASELINE|FGS-2.0.2-Dev|FGS-2.0.2-Dev.tgz BASELINE|FGS-2.0.3-Dev_src|FGS-2.0.3-Dev_src.tgz BASELINE|FGS-2.0.4-Dev|FGS-2.0.4-Dev.tgz GLOBAL_UPDATE_OPTIONS=DOS2UNIX ASTYLE #----------------------------------------------------------------------------- # Sample Histogram, ASCII Art style (looks better in PowerPoint). #----------------------------------------------------------------------------- # # FGS-1.0 # o--------------->o # | |FGS1.0.x-R # | # | # | FGS-1.1 # o--------------->o # | |FGS-1.1.x-R # | | # | | FGS-1.1.p1 # | o # FGS-2.0 | | FGS-1.1.p2 # o<------o<---------------o # | | | # | | | FGS-1-1.p3 # | | o # FGS-2.0-Dev | | # o------>o # | # | # | FGS-2.0.1-Dev_docs (docs folder only) # o # | # | FGS-2.0.2-Dev # o # | FGS-2.0.3-Dev # o # | FGS-2.0.4-Dev # o # #----------------------------------------------------------------------------- # Import Actions #----------------------------------------------------------------------------- DEPOT|FGS|stream STREAM_SPEC|FGS/main UPDATE|FGS-1.0|//FGS/main/...|Import Baseline FGS-1.0. STREAM|//FGS/R-1.0|release|//FGS/main POPULATE|//FGS/main/...|//FGS/R-1.0/...|Populated stream //FGS/R-1.0. UPDATE|FGS-1.1|//FGS/main/...|Import Baseline FGS-1.1. STREAM|//FGS/R-1.1|release|//FGS/main POPULATE|//FGS/main/...|//FGS/R-1.1/...|Populated stream //FGS/R-1.1 UPDATE|FGS-1.1.p1|//FGS/R-1.1/...|Imported baseline FGS-1.1.p1. UPDATE|FGS-1.1.p2|//FGS/R-1.1/...|Imported baseline FGS-1.1.p2. UPDATE|FGS-1.1.p2-to-MAIN-MergeResult|//FGS/main/...|Result of merging FGS-1.1.p2 back to main$Ndone in original SCM system. RECORD_MERGE|//FGS/R-1.1/...|//FGS/main/...|Recorded historic merge of FGS-1.1.p2 back to main. UPDATE|FGS-1.1.p3|//FGS/R-1.1/...|Imported baseline FGS-1.1.p3. STREAM|//FGS/2.0|development|//FGS/main POPULATE|//FGS/main/...|//FGS/2.0/...|Populated 2.0 development branch from main. UPDATE|FGS-2.0-Dev|//FGS/2.0/...|Captured development files on FGS-2.0 branch. #COPY|//FGS/2.0/...|//FGS/main/...|Release with Copy Up to MAIN from 2.0 dev stream. BRANCH_SPEC|FGS-2.0-Dev COPY|BRANCH_SPEC-r|FGS-2.0-Dev|Release with Copy Up to MAIN from 2.0 dev stream. UPDATE|FGS-2.0.1-Dev_docs|//FGS/2.0/docs/...|Captured 2.0.1 docs only updates only on 2.0 branch. UPDATE|FGS-2.0.2-Dev|//FGS/2.0/...|Captured 2.0.2 udpate in 2.0 branch. UPDATE|FGS-2.0.3-Dev_src|//FGS/2.0/src/...|Captured 2.0.3 udpate in src dir of 2.0 branch. UPDATE|FGS-2.0.4-Dev|//FGS/2.0/...|Captured 2.0.4 udpate in 2.0 branch. DEPOT_SPEC|DeepThought STREAM_SPEC|DeepThought/Components/main BRANCH_SPEC|FGS_to_DeepThought POPULATE|BRANCH_SPEC|FGS_to_DeepThought|Seed Deep Thought project from FGS. UPDATE|FGS-2.0.2-Dev|//DeepThought/Components/main/...|Put baseline FGS-2.0.2-Dev into Deep Thought main.
# | Change | User | Description | Committed | |
---|---|---|---|---|---|
#22 | 19070 | C. Thomas Tyler |
Fixed UPDATE action for stream when StreamDepth>1. Made get_stream_subdir() and get_stream in bbi_paths.sh accept a depth parameters, and modified calls in bbi_acitons.sh to determine a value for the depth paramters and pass it in. Added unit test cases for StreamDepth>1. Added full integration test case to the test suite. |
||
#21 | 18654 | C. Thomas Tyler |
Added support for replacing files with '...' in the file name. Added test case for file with '...' in the name. Fixed test data causing COPY actions to appear to fail. Fixed test data causing ASTYLE to fail for Classic Perforce. |
||
#20 | 18652 | C. Thomas Tyler |
Updated test suite to more thoroughly test ASTYLE 'include:' directive options. |
||
#19 | 18457 | C. Thomas Tyler |
Added CLIENT_SPEC action. Added VERIFY option to UPDATE action. Fixed RENAME option, renamed RENAME to MOVE, and added RENAME as a synonym for MOVE. Shortened error messages by removing redundant 'Aborting' comment in bail() calls, as messages are already prefixed with 'FATAL:'. Enhanced auditing and fixed issues with parallel submits. Updated BBI Config File require version to 3.6.0. |
||
#18 | 18408 | C. Thomas Tyler |
BBI Config File format updated to 3.5.1. RENAME action support has been re-added. |
||
#17 | 18407 | C. Thomas Tyler |
Added support for using branch specs for POPULATE, COPY, and RECORD_MERGE actions. Added support for custom description for POPULATE (which before just printed a message indicating custom messages were ignored). Adjusted test suite to test. |
||
#16 | 18402 | C. Thomas Tyler |
bbi.sh v3.5.1: Added support for BRANCH_SPEC, DEPOT_SPEC, and STREAM_SPEC actions, which allow imports to use hand-crafted spec files during imports. This allows the BBI import process to simulate the evolution of stream specs over time, e.g. to reflect reparenting, and to account for things like non-branching files and CBD workflows that use sophisticated, hand-crafted stream specs. The required BBI Config file version has been updated from 3.2 to 3.5. Test suite has been updated to test new functionality. |
||
#15 | 18392 | C. Thomas Tyler | Fixed typo in comment section of FSG.Streams.bbi.cfg. | ||
#14 | 18388 | C. Thomas Tyler |
Re-added ASTYLE testing into default test suite. Added P4BBI_TEST_BIN setting (e.g. /p4/p4bbi/test/bin), which is appended to the PATH. A fake astyle-new executable is included there for testing astyle, but is only detected if a 'real' astyle-new executable isn't found on the PATH. |
||
#13 | 18387 | C. Thomas Tyler |
Implemented the DOS2UNIX option for the UDPATE action. Updated test suite to apply DOS2UNIX. Documented DOS2UNIX in BBIConfigFileFormat.txt, and enhanced ASTYLE documentation as well. |
||
#12 | 18377 | C. Thomas Tyler |
Removed ASTYLE from default test suite to remove dependency on ASTYLE. Added custom config file for testing with ASTYLE. |
||
#11 | 18186 | C. Thomas Tyler |
Better testing for *.nobranch files. Addded 'verson.h' file to test suite. |
||
#10 | 16893 | C. Thomas Tyler | Fixed bugs description in test data. | ||
#9 | 16892 | C. Thomas Tyler | Added coverage for 'COPY' rule in the test suite. | ||
#8 | 16424 | C. Thomas Tyler | Added test for astyle. | ||
#7 | 12934 | C. Thomas Tyler |
Add ability to import subdirectories of a stream workspace root dir, allowing for smaller, more granular tar files. This is a partial implementation; it works for Streams but breaks Classic imports. TO DO: Fix this. Corrected rsync commands to use '--delete' option. This change introduces a new library file, bbi_paths.lib. Updated test suite accordingly. |
||
#6 | 12926 | C. Thomas Tyler |
Added support for BASELINE_STORAGE definition in the BBI Config file. The value can be reference a shell environment variable, added to env.sh. Updated BBI Config File required veresion to 3.2.0 Updated test suite accordingly. |
||
#5 | 12374 | C. Thomas Tyler |
Increased required BBI config file from 3.0 to 3.1. The new 3.1 format requires that a NAME tag be defined, e.g. NAME=FGS. Updated BBIConfigFileFormat.txt accordingly. This new NAME tag is incorporated into the log filename, the name of the import workspace, and the workspace root directory. This enables parallel operation of multiple concurrent imports of unrelated modules into the same target Helix server. Added doc clarification that P4CONFIG file specified with '-P' must be an absolute path, and added error checking as well. Added a check to ensure the P4CONFIG file does not define a P4CLIENT value, with appropriate error messge if it does. Added -V flag to query version of bbi.sh as well as included bash library files. Made corresponding updates to the test suite, including removing P4CLIENT from the test P4CONFIG file, and updating FGS.*.bbi.cfg files to the new confgie file format. Minor cosmetic changes. |
||
#4 | 11809 | C. Thomas Tyler | Changed to use a *.tgz file for FGS-2.0-Dev baseline. | ||
#3 | 11808 | C. Thomas Tyler |
Addd root-relative style of tar file, not needing RMTOP. Added support for *.zip files. Added -J flag to bbi.sh to obliterate junk files in BBIJunkFiles.txt. Enahnced sample files and docs. |
||
#2 | 11807 | C. Thomas Tyler |
Added initial detailed format description document. Removed duplicate text from sample config files. Updated histogram in Streams file to reflect Streams structure. |
||
#1 | 11783 | C. Thomas Tyler | Refactored new sample config files, and enhancd docs inside. | ||
//guest/perforce_software/p4bbi/dev/sample_cfg/FGS.bbi.v3.cfg | |||||
#1 | 11774 | C. Thomas Tyler |
Defined format of STREAM and DEPOT actions. Added new sample config file illustrating new v3.x format. This version parses and verifies the config file with the new fromat, but does not perform an import. |