Skip to content

Commit

Permalink
fix makefiles/Makefile.archive.mk for windows
Browse files Browse the repository at this point in the history
  • Loading branch information
lperron committed Sep 16, 2016
1 parent 3162d36 commit 457080b
Showing 1 changed file with 9 additions and 4 deletions.
13 changes: 9 additions & 4 deletions makefiles/Makefile.archive.mk
Original file line number Diff line number Diff line change
Expand Up @@ -229,25 +229,30 @@ ifeq "$(VISUAL_STUDIO_YEAR)" "2013"
build_release: clean all test
pre_release: archive test_archive
release:
else "$(VISUAL_STUDIO_YEAR)" "2015"
else
ifeq "$(VISUAL_STUDIO_YEAR)" "2015"
build_release: clean all test fz
pre_release: archive test_archive fz_archive test_fz_archive python_examples_archive pypi_archive
release: pypi_upload nuget_upload
endif #ifeq "$(VISUAL_STUDIO_YEAR)" "2015"

endif # ifeq"$(VISUAL_STUDIO_YEAR)" "2013"

else # unix

ifeq "$(PLATFORM)" "LINUX"
ifeq "$(DISTRIBUTION_NUMBER)" "14.04"
build_release: clean all test fz
pre_release: archive test_archive fz_archive test_fz_archive python_examples_archive pypi_archive
release: pypi_upload
else "$(DISTRIBUTION_NUMBER)" "16.04"
else
ifeq "$(DISTRIBUTION_NUMBER)" "16.0"
build_release: clean all test
pre_release: archive test_archive
release:
endif #ifeq "$(DISTRIBUTION_NUMBER)" "14.04"
endif #ifeq "$(PLATFORM)" "LINUX"
endif # ifeq "$(DISTRIBUTION_NUMBER)" "16.04"
endif # ifeq "$(DISTRIBUTION_NUMBER)" "14.04"
endif # ifeq "$(PLATFORM)" "LINUX"

ifeq "$(PLATFORM)" "MACOSX"
build_release: clean all test fz
Expand Down

0 comments on commit 457080b

Please sign in to comment.