open-src/common/Makefile.inc
changeset 1551 73fac33fe172
parent 1549 4b5a9782609e
child 1577 10c281fcfdde
equal deleted inserted replaced
1550:9c19e5abdaca 1551:73fac33fe172
   718 UPSTREAM_NONE_SET	= yes
   718 UPSTREAM_NONE_SET	= yes
   719 
   719 
   720 UPSTREAM_xorg		= X.Org Foundation
   720 UPSTREAM_xorg		= X.Org Foundation
   721 UPSTREAM_URL_xorg	= http://www.x.org/
   721 UPSTREAM_URL_xorg	= http://www.x.org/
   722 SOURCE_URL_xorg		= $(XORG_RELEASES_URL)/$(SOURCE_TARBALL_DIR)/$(SOURCE_TARBALL_NAME)
   722 SOURCE_URL_xorg		= $(XORG_RELEASES_URL)/$(SOURCE_TARBALL_DIR)/$(SOURCE_TARBALL_NAME)
       
   723 GIT_URL_xorg		= $(XORG_GIT_URL)/$(SOURCE_TARBALL_DIR)/$(MODULE_NAME:font-%=%)
   723 # TPNO's for X.Org software & font batches
   724 # TPNO's for X.Org software & font batches
   724 ORACLE_TPNO_xorg	= 22895
   725 ORACLE_TPNO_xorg	= 22895
   725 ORACLE_TPNO_xorg_fonts	= 11716
   726 ORACLE_TPNO_xorg_fonts	= 11716
   726 
   727 
   727 UPSTREAM_xcb		= The XCB Project
   728 UPSTREAM_xcb		= The XCB Project
   728 UPSTREAM_URL_xcb	= http://xcb.freedesktop.org/
   729 UPSTREAM_URL_xcb	= http://xcb.freedesktop.org/
   729 SOURCE_URL_xcb		= http://xcb.freedesktop.org/dist/$(SOURCE_TARBALL_NAME)
   730 SOURCE_URL_xcb		= http://xcb.freedesktop.org/dist/$(SOURCE_TARBALL_NAME)
       
   731 GIT_URL_xcb		= $(FDO_GIT_URL)/xcb/$(MODULE_NAME:xcb-%=%)
   730 ORACLE_TPNO_xcb		= 18006
   732 ORACLE_TPNO_xcb		= 18006
   731 
   733 
   732 UPSTREAM_PROJECT_DEFAULT	= $(UPSTREAM_PROJECT_SET:yes=$(POUND_SIGN))
   734 UPSTREAM_PROJECT_DEFAULT	= $(UPSTREAM_PROJECT_SET:yes=$(POUND_SIGN))
   733 $(UPSTREAM_PROJECT_DEFAULT)	UPSTREAM_PROJECT = xorg
       
   734 
   735 
   735 UPSTREAM_DEFAULT	= $(UPSTREAM_SET:yes=$(POUND_SIGN))
   736 UPSTREAM_DEFAULT	= $(UPSTREAM_SET:yes=$(POUND_SIGN))
   736 $(UPSTREAM_DEFAULT) UPSTREAM = $(UPSTREAM_$(SOURCE_TARBALL_NAME))
   737 $(UPSTREAM_DEFAULT) UPSTREAM = $(UPSTREAM_$(SOURCE_TARBALL_NAME))
   737 $(UPSTREAM_DEFAULT) UPSTREAM_SET_YET = $(UPSTREAM_$(SOURCE_TARBALL_NAME)_SET)
   738 $(UPSTREAM_DEFAULT) UPSTREAM_SET_YET = $(UPSTREAM_$(SOURCE_TARBALL_NAME)_SET)
   738 $(UPSTREAM_DEFAULT) UPSTREAM_NOTFOUND = $(UPSTREAM_SET_YET:yes=$(POUND_SIGN))
   739 $(UPSTREAM_DEFAULT) UPSTREAM_NOTFOUND = $(UPSTREAM_SET_YET:yes=$(POUND_SIGN))
       
   740 $(UPSTREAM_DEFAULT) $(UPSTREAM_NOTFOUND) $(UPSTREAM_PROJECT_DEFAULT) UPSTREAM_PROJECT = xorg
   739 $(UPSTREAM_NOTFOUND) $(SOURCE_URL_DEFAULT) UPSTREAM = $(UPSTREAM_$(UPSTREAM_PROJECT))
   741 $(UPSTREAM_NOTFOUND) $(SOURCE_URL_DEFAULT) UPSTREAM = $(UPSTREAM_$(UPSTREAM_PROJECT))
   740 $(UPSTREAM_NOTFOUND) $(SOURCE_URL_DEFAULT) UPSTREAM_URL = $(UPSTREAM_URL_$(UPSTREAM_PROJECT))
   742 $(UPSTREAM_NOTFOUND) $(SOURCE_URL_DEFAULT) UPSTREAM_URL = $(UPSTREAM_URL_$(UPSTREAM_PROJECT))
   741 ORACLE_TPNO_DEFAULT	= $(ORACLE_TPNO_SET:yes=$(POUND_SIGN))
   743 ORACLE_TPNO_DEFAULT	= $(ORACLE_TPNO_SET:yes=$(POUND_SIGN))
   742 $(UPSTREAM_NOTFOUND) $(SOURCE_URL_DEFAULT) $(ORACLE_TPNO_DEFAULT) ORACLE_TPNO = $(ORACLE_TPNO_$(UPSTREAM_PROJECT))
   744 $(UPSTREAM_NOTFOUND) $(SOURCE_URL_DEFAULT) $(ORACLE_TPNO_DEFAULT) ORACLE_TPNO = $(ORACLE_TPNO_$(UPSTREAM_PROJECT))
   743 
   745 
   758 	fi
   760 	fi
   759 	@if [[ "$(UPSTREAM)" != "NONE" ]] ; then \
   761 	@if [[ "$(UPSTREAM)" != "NONE" ]] ; then \
   760 	    $(START_CMD_ECHO) ; \
   762 	    $(START_CMD_ECHO) ; \
   761 	    print 'set name=info.upstream value="$(UPSTREAM)"' >> $@ ; \
   763 	    print 'set name=info.upstream value="$(UPSTREAM)"' >> $@ ; \
   762 	    print 'set name=info.upstream-url value="$(UPSTREAM_URL)"' >> $@ ; \
   764 	    print 'set name=info.upstream-url value="$(UPSTREAM_URL)"' >> $@ ; \
       
   765 	fi
       
   766 	@if [[ ! -z "$(GIT_URL)" ]] ; then \
       
   767 	    $(START_CMD_ECHO) ; \
       
   768 	    print 'set name=info.repository-url value="$(GIT_URL)"' >> $@ ; \
   763 	fi
   769 	fi
   764 	@if [[ ! -z "$(MODULE_ARC_CASES)" ]] ; then \
   770 	@if [[ ! -z "$(MODULE_ARC_CASES)" ]] ; then \
   765 	    $(START_CMD_ECHO) ; \
   771 	    $(START_CMD_ECHO) ; \
   766 	    print 'set name=org.opensolaris.arc-caseid' \
   772 	    print 'set name=org.opensolaris.arc-caseid' \
   767 		'$(MODULE_ARC_CASES:%=value="%")' >> $@ ;  \
   773 		'$(MODULE_ARC_CASES:%=value="%")' >> $@ ;  \