Subversion Repositories DevTools

Rev

Rev 261 | Rev 267 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 261 Rev 263
Line 90... Line 90...
90
our @CLOBBERFILES           = ();               # Files to clobber
90
our @CLOBBERFILES           = ();               # Files to clobber
91
our %BUILD_KNOWNFILES       = ();               # Files that will be known
91
our %BUILD_KNOWNFILES       = ();               # Files that will be known
92
 
92
 
93
our $Makelib                = "";
93
our $Makelib                = "";
94
 
94
 
-
 
95
our $GBE_CORE;                                  # Root of JATS
-
 
96
our $MAKELIB_PL;                                # Name of the makelib file
-
 
97
our $InterfaceVersion;                          # Interface directory format version
-
 
98
our $ScmInterface;                              # Interface directory
-
 
99
 
-
 
100
 
95
 
101
 
96
my  $DeleteDPACKAGE         = 0;                # Must clobber DPACKAGE
102
my  $DeleteDPACKAGE         = 0;                # Must clobber DPACKAGE
97
my  $opt_help               = 0;
103
my  $opt_help               = 0;
98
 
104
 
99
BuildLibInit();
105
BuildLibInit();
Line 141... Line 147...
141
    Debug( "Makelib:   $Makelib" );
147
    Debug( "Makelib:   $Makelib" );
142
    Debug( "BuildFile: $ScmBuildSrc" );
148
    Debug( "BuildFile: $ScmBuildSrc" );
143
 
149
 
144
    Verbose ("Command Line: @ARGV");
150
    Verbose ("Command Line: @ARGV");
145
    my $result = GetOptions (
151
    my $result = GetOptions (
146
                "help|h|usage+" => \$opt_help,
152
                "help|h:+"      => \$opt_help,
147
                "man"           => sub{ $opt_help = 3},
153
                "man:3"         => \$opt_help,
148
                "debug:+"       => \$::ScmDebug,
154
                "debug:+"       => \$::ScmDebug,
149
                "verbose:+"     => \$::ScmVerbose,
155
                "verbose:+"     => \$::ScmVerbose,
150
                "expert:1"      => \$Expert,
156
                "expert:1"      => \$Expert,
151
                "all"           => \$All,
157
                "all"           => \$All,
152
                "nolog"         => \$Nolog,
158
                "nolog"         => \$Nolog,
Line 2646... Line 2652...
2646
 
2652
 
2647
    if ( $Clobber )                             # clobber mode ?
2653
    if ( $Clobber )                             # clobber mode ?
2648
    {
2654
    {
2649
        if ( -e "Makefile.gbe" )
2655
        if ( -e "Makefile.gbe" )
2650
        {
2656
        {
2651
            JatsCmd ( 'jmake', 'unmakefiles');
2657
            JatsTool ( 'jmake.pl', 'unmakefiles');
2652
            unlink "Makefile.gbe";
2658
            unlink "Makefile.gbe";
2653
        }
2659
        }
2654
 
2660
 
2655
        DeleteCfg();
2661
        DeleteCfg();
2656
 
2662
 
Line 2748... Line 2754...
2748
    SubDir( @BUILDSUBDIRS );
2754
    SubDir( @BUILDSUBDIRS );
2749
    Platform( @BUILD_ACTIVEPLATFORMS );
2755
    Platform( @BUILD_ACTIVEPLATFORMS );
2750
 
2756
 
2751
    #.. (re)build src makefiles and associated information
2757
    #.. (re)build src makefiles and associated information
2752
    #
2758
    #
2753
    my @cmds = ('jmake', 'rebuild');
2759
    my @cmds = ('jmake.pl', 'rebuild');
2754
    push @cmds, 'NORECURSE=1' if ( $RootOnly );
2760
    push @cmds, 'NORECURSE=1' if ( $RootOnly );
2755
 
2761
 
2756
    JatsCmd ( @cmds);
2762
    JatsTool ( @cmds);
2757
}
2763
}
2758
 
2764
 
2759
 
2765
 
2760
#-------------------------------------------------------------------------------
2766
#-------------------------------------------------------------------------------
2761
# Function        : BuildVersion
2767
# Function        : BuildVersion
Line 2789... Line 2795...
2789
    my $ModePrefix;
2795
    my $ModePrefix;
2790
    my $Style = "C";
2796
    my $Style = "C";
2791
    my $FileName;
2797
    my $FileName;
2792
    my $VersionFiles;
2798
    my $VersionFiles;
2793
    my $IconName;
2799
    my $IconName;
-
 
2800
    my $DefinitionsOnly;
2794
 
2801
 
2795
    StartBuildPhase();                          # Starting the build phase. No more data collection
2802
    StartBuildPhase();                          # Starting the build phase. No more data collection
2796
 
2803
 
2797
    if ( defined($Prefix) && $Prefix =~ /^--/ )
2804
    if ( defined($Prefix) && $Prefix =~ /^--/ )
2798
    {
2805
    {
Line 2824... Line 2831...
2824
                $FileName = $1;
2831
                $FileName = $1;
2825
 
2832
 
2826
            } elsif ( /^--Icon=(.*)/ ) {
2833
            } elsif ( /^--Icon=(.*)/ ) {
2827
                $IconName = $1;
2834
                $IconName = $1;
2828
 
2835
 
-
 
2836
            } elsif ( /^--Definitions/ ) {
-
 
2837
                $DefinitionsOnly = 1;
-
 
2838
                
2829
            } else {
2839
            } else {
2830
                Error ("BuildVersion: Unknown option: $_");
2840
                Error ("BuildVersion: Unknown option: $_");
2831
 
2841
 
2832
            }
2842
            }
2833
        }
2843
        }
Line 2860... Line 2870...
2860
 
2870
 
2861
    } elsif ( $Style =~ /^Properties/i ) {
2871
    } elsif ( $Style =~ /^Properties/i ) {
2862
        BuildVersionProperties( $FileName, $Prefix );
2872
        BuildVersionProperties( $FileName, $Prefix );
2863
 
2873
 
2864
    } elsif ( $Style =~ /^WinRC/i ) {
2874
    } elsif ( $Style =~ /^WinRC/i ) {
2865
        BuildVersionWinRC( $FileName, $IconName );
2875
        BuildVersionWinRC( $FileName, $IconName, $DefinitionsOnly );
2866
 
2876
 
2867
    } elsif ( $Style eq "C" ) {
2877
    } elsif ( $Style eq "C" ) {
2868
        BuildVersionC    ( $Prefix, $Type )     if ( $VersionFiles );
2878
        BuildVersionC    ( $Prefix, $Type )     if ( $VersionFiles );
2869
        BuildVersionCdefs( $Mode, $ModePrefix ) if ( $Mode );
2879
        BuildVersionCdefs( $Mode, $ModePrefix ) if ( $Mode );
2870
 
2880