Download as
Browse Code »

Commit a76641c71e99af010979e10bbf1f9b64da77b76c

Authored by Sergio Oliveira
1 parent 2e06c7ee
Exists in master and in 53 other branches add_sisp_to_chef, add_super_archives_plugin, automates_core_packing, backup_not_prod, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, colab_widgets_settings, disable_email_dev, fix_breadcrumbs_position, fix_categories_software_link, fix_edit_institution, fix_edit_software_with_another_license, fix_get_license_info, fix_gitlab_assets_permission, fix_list_style_inside_article, fix_list_style_on_folder_elements, fix_merge_request_url, fix_models_translations, fix_no_license, fix_software_api, fix_software_block_migration, fix_software_communities_translations, fix_software_communities_unit_test, fix_style_create_institution_admin_panel, fix_superarchives_imports, fix_sym_links_noosfero, header_fix, lxc_settings, margin_fix, mezuro_cookbook, refactor_download_block, remove-unused-images, remove_broken_theme, remove_secondary_email_from_user, remove_sisp_buttons, sisp_catalog_header, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_simple_version, software_catalog_style_fix, software_communities_html_refactor, software_infos_api, spb_to_rails4, stable-4.1, stable-4.2, stable-4.x, theme_header, theme_javascript_refactory, thread_dropdown, update_search_by_categories, update_software_api

Renamed obs commands 

(cherry picked from commit 73bd5932f34b67b82821f9bb6aaeb227d9b68ca8)
Showing 1 changed file with 37 additions and 25 deletions   Show diff stats
src/pkg-rpm/Makefile
  Diff comments   View file @a76641c
@@ -10,58 +10,70 @@ obsdir = .obs @@ -10,58 +10,70 @@ obsdir = .obs
10 all: 10 all:
11 @echo "Usage:" 11 @echo "Usage:"
12 @echo 12 @echo
13 - @echo '$$ make $${pkg}-checkout checkout $${pkg}'  
14 - @echo '$$ make $${pkg}-upload uploads package $${pkg}'  
15 - @echo '$$ make $${pkg}-build builds package $${pkg} locally'  
16 - @echo '$$ make $${pkg}-diff diff from OBS to git for package $${pkg}'  
17 @echo 13 @echo
18 @echo '$${pkg} can be one of: $(packages)' 14 @echo '$${pkg} can be one of: $(packages)'
19 @echo 15 @echo
  16 + @echo '$$ make $${pkg}-build builds package $${pkg} locally'
  17 + @echo
  18 + @echo 'Operations on all packages:'
  19 + @echo
  20 + @echo '$$ make build-all builds all packages locally'
  21 + @echo
  22 + @echo
  23 + @echo 'Working with OBS (deprecated):'
  24 + @echo
  25 + @echo '$$ make $${pkg}-checkout-obs checkout $${pkg}'
  26 + @echo '$$ make $${pkg}-upload-obs uploads package $${pkg}'
  27 + @echo '$$ make $${pkg}-diff-obs diff from OBS to git for package $${pkg}'
  28 + @echo
20 @echo Use OBSPROJECT=project:name to control where to upload to. 29 @echo Use OBSPROJECT=project:name to control where to upload to.
21 @echo '(currently: $(OBSPROJECT))'. Example: 30 @echo '(currently: $(OBSPROJECT))'. Example:
22 @echo 31 @echo
23 - @echo \ \ \ \ $$ make colab-upload OBSPROJECT=isv:spb:v3 32 + @echo \ \ \ \ $$ make colab-upload-obs OBSPROJECT=isv:spb:v3
24 @echo 33 @echo
25 @echo 'Operations on all packages:' 34 @echo 'Operations on all packages:'
26 @echo 35 @echo
27 - @echo '$$ make diff diff of all packages from OBS to git'  
28 - @echo '$$ make status|st diffstat of all packages from OBS to git'  
29 - @echo '$$ make checkout-all checks out all packages from OBS'  
30 - @echo '$$ make build-all builds all packages locally' 36 + @echo '$$ make diff-obs diff of all packages from OBS to git'
  37 + @echo '$$ make status-obs|st-obs diffstat of all packages from OBS to git'
  38 + @echo '$$ make checkout-all-obs checks out all packages from OBS'
31 39
32 40
33 -checkout_packages = $(patsubst %, %-checkout, $(packages))  
34 build_packages = $(patsubst %, %-build, $(packages)) 41 build_packages = $(patsubst %, %-build, $(packages))
35 -upload_packages = $(patsubst %, %-upload, $(packages))  
36 -diff_packages = $(patsubst %, %-diff, $(packages)) 42 +checkout_packages_obs = $(patsubst %, %-checkout-obs, $(packages))
  43 +upload_packages_obs = $(patsubst %, %-upload-obs, $(packages))
  44 +diff_packages_obs = $(patsubst %, %-diff-obs, $(packages))
37 45
38 -.PHONY: $(checkout_packages) $(build_packages) $(upload_packages) $(diff_packages) 46 +.PHONY: $(build_packages) $(checkout_packages_obs) $(upload_packages_obs) $(diff_packages_obs)
39 47
40 -checkout-all: $(checkout_packages)  
41 build-all: $(build_packages) 48 build-all: $(build_packages)
42 49
43 -$(checkout_packages): %-checkout : %  
44 - mkdir -p $(obsdir)  
45 - [ -d $(obsdir)/$(OBSPROJECT)/$* ] && \  
46 - (cd $(obsdir)/$(OBSPROJECT)/$* && osc update) || \  
47 - (cd $(obsdir) && osc checkout $(OBSPROJECT) $*)  
48 -  
49 $(build_packages): %-build : % 50 $(build_packages): %-build : %
50 mkdir -p ~/rpmbuild/SOURCES 51 mkdir -p ~/rpmbuild/SOURCES
51 cp $(obsdir)/$(OBSPROJECT)/$*/*.tar.* ~/rpmbuild/SOURCES/ 52 cp $(obsdir)/$(OBSPROJECT)/$*/*.tar.* ~/rpmbuild/SOURCES/
52 cp $*/*.patch ~/rpmbuild/SOURCES/ || true 53 cp $*/*.patch ~/rpmbuild/SOURCES/ || true
53 cd $* && $(BUILD_PREFIX) rpmbuild -bb $*.spec 54 cd $* && $(BUILD_PREFIX) rpmbuild -bb $*.spec
54 55
55 -$(upload_packages): %-upload : %-checkout  
56 - $(MAKE) $*-diff 56 +
  57 +### OBS targets (deprecated)
  58 +
  59 +checkout-all-obs: $(checkout_packages_obs)
  60 +
  61 +$(checkout_packages_obs): %-checkout-obs : %
  62 + mkdir -p $(obsdir)
  63 + [ -d $(obsdir)/$(OBSPROJECT)/$* ] && \
  64 + (cd $(obsdir)/$(OBSPROJECT)/$* && osc update) || \
  65 + (cd $(obsdir) && osc checkout $(OBSPROJECT) $*)
  66 +
  67 +$(upload_packages_obs): %-upload-obs : %-checkout-obs
  68 + $(MAKE) $*-diff-obs
57 @printf "Confirm upload? [y/N] "; read confirm; test "$$confirm" = y -o "$$confirm" = Y 69 @printf "Confirm upload? [y/N] "; read confirm; test "$$confirm" = y -o "$$confirm" = Y
58 cp $*/* $(obsdir)/$(OBSPROJECT)/$* 70 cp $*/* $(obsdir)/$(OBSPROJECT)/$*
59 (cd $(obsdir)/$(OBSPROJECT)/$*; osc add *; osc commit -m "update $*") 71 (cd $(obsdir)/$(OBSPROJECT)/$*; osc add *; osc commit -m "update $*")
60 72
61 -$(diff_packages): %-diff : % 73 +$(diff_packages_obs): %-diff-obs : %
62 @git diff --no-index $(obsdir)/$(OBSPROJECT)/$*/$*.spec $*/$*.spec || true 74 @git diff --no-index $(obsdir)/$(OBSPROJECT)/$*/$*.spec $*/$*.spec || true
63 75
64 -diff: $(diff_packages) 76 +diff-obs: $(diff_packages_obs)
65 77
66 -status st: 78 +status-obs st-obs:
67 @$(MAKE) diff | diffstat -C 79 @$(MAKE) diff | diffstat -C