Commits

Anonymous committed 4e62cb3

CWS-TOOLING: integrate CWS ause105
2009-07-08 17:57:23 +0200 hjs r273843 : #i103418# add missing dependency on localized .hrc files
2009-07-08 17:28:46 +0200 hjs r273841 : #i103416# handle new solver subdir sdf
2009-07-08 11:27:47 +0200 hjs r273823 : #i103409# disable cmd.exe autorun
2009-07-07 19:23:23 +0200 hjs r273813 : #i103394# fix path handling of files failed in first run of rebase.exe

  • Participants
  • Parent commits f140f24

Comments (0)

Files changed (5)

File postprocess/rebase/rebase.pl

     my $oldfiles_ref = shift;
     my $newfiles_ref = shift;
     my @grownfiles;
+    my $solarbin ="$ENV{SOLARVERSION}/$ENV{INPATH}/bin$ENV{UPDMINOREXT}";
     my $command = "rebase " . $options_string;
     if ( $ENV{WRAPCMD} ) {
         $command = $ENV{WRAPCMD} . " " . $command;
         print;
         # evaluate error messages
         if ( /REBASE: ([^\s]+).*Grew too large/ ) {
-            push @grownfiles, $1;
+            my $toobig_name = $1;
+            if ( -e "$solarbin/so/$toobig_name" ) {
+                push @grownfiles, "$solarbin/so/$toobig_name";
+                print "name was : $toobig_name\n";
+                print "push $solarbin/so/$toobig_name\n";
+            } else {
+                push @grownfiles, "$solarbin/$toobig_name";
+            }
         }
     }
     close( COMMAND );

File solenv/bin/cws.pl

     my $solver     = shift;
     my $milestone  = shift;
 
-    my @zip_sub_dirs = ('bin', 'doc', 'idl', 'inc', 'lib', 'par', 'pck', 'pdb', 'pus', 'rdb', 'res', 'xml');
+    my @zip_sub_dirs = ('bin', 'doc', 'idl', 'inc', 'lib', 'par', 'pck', 'pdb', 'pus', 'rdb', 'res', 'xml', 'sdf');
     
     use Archive::Zip qw( :ERROR_CODES :CONSTANTS );
 

File solenv/inc/_tg_srs.mk

 
 .ENDIF # "$(BUILDHIDS)"!=""
 
-$(MISC)$/$(TARGET).$(SRS1NAME).dprr: $(SRC1FILES) $(HIDSRS1PARTICLE) $(HID1FILES)
+$(MISC)$/$(TARGET).$(SRS1NAME).dprr: $(SRC1FILES) $(HIDSRS1PARTICLE) $(HID1FILES) $(LOCALIZE_ME_DEST)
 	@echo ------------------------------
 	@echo Making: $@
 	@@-$(RM) $(MISC)$/$(TARGET).$(SRS1NAME).dprr
     $(RENAME) $@.$(INPATH) $@
     -$(RM) $@.$(INPATH)
 
-$(SRS)$/$(SRS1NAME).srs: $(foreach,i,$(SRC1FILES) $(COMMONMISC)$/$(TARGET)$/$i)
+$(SRS)$/$(SRS1NAME).srs: $(foreach,i,$(SRC1FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST)
 .ELSE			# "$(WITH_LANG)"!=""
 $(SRS)$/$(SRS1NAME).srs: $(SRC1FILES)
 .ENDIF			# "$(WITH_LANG)"!=""
 
 .ENDIF # "$(BUILDHIDS)"!=""
 
-$(MISC)$/$(TARGET).$(SRS2NAME).dprr: $(SRC2FILES) $(HIDSRS2PARTICLE) $(HID2FILES)
+$(MISC)$/$(TARGET).$(SRS2NAME).dprr: $(SRC2FILES) $(HIDSRS2PARTICLE) $(HID2FILES) $(LOCALIZE_ME_DEST)
 	@echo ------------------------------
 	@echo Making: $@
 	@@-$(RM) $(MISC)$/$(TARGET).$(SRS2NAME).dprr
     $(RENAME) $@.$(INPATH) $@
     -$(RM) $@.$(INPATH)
 
-$(SRS)$/$(SRS2NAME).srs: $(foreach,i,$(SRC2FILES) $(COMMONMISC)$/$(TARGET)$/$i)
+$(SRS)$/$(SRS2NAME).srs: $(foreach,i,$(SRC2FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST)
 .ELSE			# "$(WITH_LANG)"!=""
 $(SRS)$/$(SRS2NAME).srs: $(SRC2FILES)
 .ENDIF			# "$(WITH_LANG)"!=""
 
 .ENDIF # "$(BUILDHIDS)"!=""
 
-$(MISC)$/$(TARGET).$(SRS3NAME).dprr: $(SRC3FILES) $(HIDSRS3PARTICLE) $(HID3FILES)
+$(MISC)$/$(TARGET).$(SRS3NAME).dprr: $(SRC3FILES) $(HIDSRS3PARTICLE) $(HID3FILES) $(LOCALIZE_ME_DEST)
 	@echo ------------------------------
 	@echo Making: $@
 	@@-$(RM) $(MISC)$/$(TARGET).$(SRS3NAME).dprr
     $(RENAME) $@.$(INPATH) $@
     -$(RM) $@.$(INPATH)
 
-$(SRS)$/$(SRS3NAME).srs: $(foreach,i,$(SRC3FILES) $(COMMONMISC)$/$(TARGET)$/$i)
+$(SRS)$/$(SRS3NAME).srs: $(foreach,i,$(SRC3FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST)
 .ELSE			# "$(WITH_LANG)"!=""
 $(SRS)$/$(SRS3NAME).srs: $(SRC3FILES)
 .ENDIF			# "$(WITH_LANG)"!=""
 
 .ENDIF # "$(BUILDHIDS)"!=""
 
-$(MISC)$/$(TARGET).$(SRS4NAME).dprr: $(SRC4FILES) $(HIDSRS4PARTICLE) $(HID4FILES)
+$(MISC)$/$(TARGET).$(SRS4NAME).dprr: $(SRC4FILES) $(HIDSRS4PARTICLE) $(HID4FILES) $(LOCALIZE_ME_DEST)
 	@echo ------------------------------
 	@echo Making: $@
 	@@-$(RM) $(MISC)$/$(TARGET).$(SRS4NAME).dprr
     $(RENAME) $@.$(INPATH) $@
     -$(RM) $@.$(INPATH)
 
-$(SRS)$/$(SRS4NAME).srs: $(foreach,i,$(SRC4FILES) $(COMMONMISC)$/$(TARGET)$/$i)
+$(SRS)$/$(SRS4NAME).srs: $(foreach,i,$(SRC4FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST)
 .ELSE			# "$(WITH_LANG)"!=""
 $(SRS)$/$(SRS4NAME).srs: $(SRC4FILES)
 .ENDIF			# "$(WITH_LANG)"!=""
 
 .ENDIF # "$(BUILDHIDS)"!=""
 
-$(MISC)$/$(TARGET).$(SRS5NAME).dprr: $(SRC5FILES) $(HIDSRS5PARTICLE) $(HID5FILES)
+$(MISC)$/$(TARGET).$(SRS5NAME).dprr: $(SRC5FILES) $(HIDSRS5PARTICLE) $(HID5FILES) $(LOCALIZE_ME_DEST)
 	@echo ------------------------------
 	@echo Making: $@
 	@@-$(RM) $(MISC)$/$(TARGET).$(SRS5NAME).dprr
     $(RENAME) $@.$(INPATH) $@
     -$(RM) $@.$(INPATH)
 
-$(SRS)$/$(SRS5NAME).srs: $(foreach,i,$(SRC5FILES) $(COMMONMISC)$/$(TARGET)$/$i)
+$(SRS)$/$(SRS5NAME).srs: $(foreach,i,$(SRC5FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST)
 .ELSE			# "$(WITH_LANG)"!=""
 $(SRS)$/$(SRS5NAME).srs: $(SRC5FILES)
 .ENDIF			# "$(WITH_LANG)"!=""
 
 .ENDIF # "$(BUILDHIDS)"!=""
 
-$(MISC)$/$(TARGET).$(SRS6NAME).dprr: $(SRC6FILES) $(HIDSRS6PARTICLE) $(HID6FILES)
+$(MISC)$/$(TARGET).$(SRS6NAME).dprr: $(SRC6FILES) $(HIDSRS6PARTICLE) $(HID6FILES) $(LOCALIZE_ME_DEST)
 	@echo ------------------------------
 	@echo Making: $@
 	@@-$(RM) $(MISC)$/$(TARGET).$(SRS6NAME).dprr
     $(RENAME) $@.$(INPATH) $@
     -$(RM) $@.$(INPATH)
 
-$(SRS)$/$(SRS6NAME).srs: $(foreach,i,$(SRC6FILES) $(COMMONMISC)$/$(TARGET)$/$i)
+$(SRS)$/$(SRS6NAME).srs: $(foreach,i,$(SRC6FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST)
 .ELSE			# "$(WITH_LANG)"!=""
 $(SRS)$/$(SRS6NAME).srs: $(SRC6FILES)
 .ENDIF			# "$(WITH_LANG)"!=""
 
 .ENDIF # "$(BUILDHIDS)"!=""
 
-$(MISC)$/$(TARGET).$(SRS7NAME).dprr: $(SRC7FILES) $(HIDSRS7PARTICLE) $(HID7FILES)
+$(MISC)$/$(TARGET).$(SRS7NAME).dprr: $(SRC7FILES) $(HIDSRS7PARTICLE) $(HID7FILES) $(LOCALIZE_ME_DEST)
 	@echo ------------------------------
 	@echo Making: $@
 	@@-$(RM) $(MISC)$/$(TARGET).$(SRS7NAME).dprr
     $(RENAME) $@.$(INPATH) $@
     -$(RM) $@.$(INPATH)
 
-$(SRS)$/$(SRS7NAME).srs: $(foreach,i,$(SRC7FILES) $(COMMONMISC)$/$(TARGET)$/$i)
+$(SRS)$/$(SRS7NAME).srs: $(foreach,i,$(SRC7FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST)
 .ELSE			# "$(WITH_LANG)"!=""
 $(SRS)$/$(SRS7NAME).srs: $(SRC7FILES)
 .ENDIF			# "$(WITH_LANG)"!=""
 
 .ENDIF # "$(BUILDHIDS)"!=""
 
-$(MISC)$/$(TARGET).$(SRS8NAME).dprr: $(SRC8FILES) $(HIDSRS8PARTICLE) $(HID8FILES)
+$(MISC)$/$(TARGET).$(SRS8NAME).dprr: $(SRC8FILES) $(HIDSRS8PARTICLE) $(HID8FILES) $(LOCALIZE_ME_DEST)
 	@echo ------------------------------
 	@echo Making: $@
 	@@-$(RM) $(MISC)$/$(TARGET).$(SRS8NAME).dprr
     $(RENAME) $@.$(INPATH) $@
     -$(RM) $@.$(INPATH)
 
-$(SRS)$/$(SRS8NAME).srs: $(foreach,i,$(SRC8FILES) $(COMMONMISC)$/$(TARGET)$/$i)
+$(SRS)$/$(SRS8NAME).srs: $(foreach,i,$(SRC8FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST)
 .ELSE			# "$(WITH_LANG)"!=""
 $(SRS)$/$(SRS8NAME).srs: $(SRC8FILES)
 .ENDIF			# "$(WITH_LANG)"!=""
 
 .ENDIF # "$(BUILDHIDS)"!=""
 
-$(MISC)$/$(TARGET).$(SRS9NAME).dprr: $(SRC9FILES) $(HIDSRS9PARTICLE) $(HID9FILES)
+$(MISC)$/$(TARGET).$(SRS9NAME).dprr: $(SRC9FILES) $(HIDSRS9PARTICLE) $(HID9FILES) $(LOCALIZE_ME_DEST)
 	@echo ------------------------------
 	@echo Making: $@
 	@@-$(RM) $(MISC)$/$(TARGET).$(SRS9NAME).dprr
     $(RENAME) $@.$(INPATH) $@
     -$(RM) $@.$(INPATH)
 
-$(SRS)$/$(SRS9NAME).srs: $(foreach,i,$(SRC9FILES) $(COMMONMISC)$/$(TARGET)$/$i)
+$(SRS)$/$(SRS9NAME).srs: $(foreach,i,$(SRC9FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST)
 .ELSE			# "$(WITH_LANG)"!=""
 $(SRS)$/$(SRS9NAME).srs: $(SRC9FILES)
 .ENDIF			# "$(WITH_LANG)"!=""
 
 .ENDIF # "$(BUILDHIDS)"!=""
 
-$(MISC)$/$(TARGET).$(SRS10NAME).dprr: $(SRC10FILES) $(HIDSRS10PARTICLE) $(HID10FILES)
+$(MISC)$/$(TARGET).$(SRS10NAME).dprr: $(SRC10FILES) $(HIDSRS10PARTICLE) $(HID10FILES) $(LOCALIZE_ME_DEST)
 	@echo ------------------------------
 	@echo Making: $@
 	@@-$(RM) $(MISC)$/$(TARGET).$(SRS10NAME).dprr
     $(RENAME) $@.$(INPATH) $@
     -$(RM) $@.$(INPATH)
 
-$(SRS)$/$(SRS10NAME).srs: $(foreach,i,$(SRC10FILES) $(COMMONMISC)$/$(TARGET)$/$i)
+$(SRS)$/$(SRS10NAME).srs: $(foreach,i,$(SRC10FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST)
 .ELSE			# "$(WITH_LANG)"!=""
 $(SRS)$/$(SRS10NAME).srs: $(SRC10FILES)
 .ENDIF			# "$(WITH_LANG)"!=""

File solenv/inc/tg_srs.mk

 
 .ENDIF # "$(BUILDHIDS)"!=""
 
-$(MISC)$/$(TARGET).$(SRS$(TNR)NAME).dprr: $(SRC$(TNR)FILES) $(HIDSRS$(TNR)PARTICLE) $(HID$(TNR)FILES)
+$(MISC)$/$(TARGET).$(SRS$(TNR)NAME).dprr: $(SRC$(TNR)FILES) $(HIDSRS$(TNR)PARTICLE) $(HID$(TNR)FILES) $(LOCALIZE_ME_DEST)
 	@echo ------------------------------
 	@echo Making: $@
 	@@-$(RM) $(MISC)$/$(TARGET).$(SRS$(TNR)NAME).dprr
     $(RENAME) $@.$(INPATH) $@
     -$(RM) $@.$(INPATH)
 
-$(SRS)$/$(SRS$(TNR)NAME).srs: $(foreach,i,$(SRC$(TNR)FILES) $(COMMONMISC)$/$(TARGET)$/$i)
+$(SRS)$/$(SRS$(TNR)NAME).srs: $(foreach,i,$(SRC$(TNR)FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST)
 .ELSE			# "$(WITH_LANG)"!=""
 $(SRS)$/$(SRS$(TNR)NAME).srs: $(SRC$(TNR)FILES)
 .ENDIF			# "$(WITH_LANG)"!=""

File xpdf/makefile.mk

 BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS)
 .ELSE
 CONFIGURE_ACTION=
-BUILD_ACTION= cmd.exe /c ms_make.bat
+BUILD_ACTION= cmd.exe /d /c ms_make.bat
 .ENDIF
 .ENDIF