Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:GNUmakefile: improve targets for build rpm packages
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 346e8b41d40a107c6c526512fc7db60ab9f97385
User & Date: fifr 2021-06-09 12:14:14.663
Context
2021-06-09
20:05
Document: replace some forbidden characters in pdf file name check-in: aeca8e7b16 user: fifr tags: release
12:42
Merge cvmat check-in: c64afe6356 user: fifr tags: trunk
12:17
Merge trunk Closed-Leaf check-in: a89620274d user: fifr tags: cvmat
12:14
GNUmakefile: improve targets for build rpm packages check-in: 346e8b41d4 user: fifr tags: trunk
07:08
ScanImage: add missing `return` check-in: aafcd443f6 user: fifr tags: trunk
Changes
Unified Diff Ignore Whitespace Patch
Changes to CMakeLists.txt.
︙︙
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58

  src/Convert.cxx
  src/EdgeDetection.cxx

  src/init.cxx)

set_property(SOURCE src/Fotokopierer.cxx APPEND PROPERTY COMPILE_DEFINITIONS
  FOTOKOPIERER_AUTHOR="Frank Fischer"
  FOTOKOPIERER_VERSION="${FOTOKOPIERER_VERSION}"
  PODOFO_VERSION="${PODOFO_VERSION}"
  OPENCV_VERSION="${OPENCV_VERSION}"
  FREETYPE_VERSION="${FREETYPE_VERSION}"
  )

if (SAILFISH_FOUND)
  set(OpenCV_SOURCE_DIR ${PROJECT_SOURCE_DIR}/3rdparty/opencv-${OPENCV_VERSION}-${CMAKE_SYSTEM_PROCESSOR})








|








44
45
46
47
48
49
50
51
52
53
54
55
56
57
58

  src/Convert.cxx
  src/EdgeDetection.cxx

  src/init.cxx)

set_property(SOURCE src/Fotokopierer.cxx APPEND PROPERTY COMPILE_DEFINITIONS
  FOTOKOPIERER_AUTHOR="Frank Fischer"
  FOTOKOPIERER_VERSION="${FOTOKOPIERER_VERSION}.fossil+dc702920"
  PODOFO_VERSION="${PODOFO_VERSION}"
  OPENCV_VERSION="${OPENCV_VERSION}"
  FREETYPE_VERSION="${FREETYPE_VERSION}"
  )

if (SAILFISH_FOUND)
  set(OpenCV_SOURCE_DIR ${PROJECT_SOURCE_DIR}/3rdparty/opencv-${OPENCV_VERSION}-${CMAKE_SYSTEM_PROCESSOR})
︙︙
Changes to GNUmakefile.
︙︙
31
32
33
34
35
36
37
38
39
40

41
42
43
44
45
46
47
48
49

50
51
52
53
54
55



56
57
58





59



60
61
62
63
64
65
66

else
  build_dir := rpmbuilddir-$(arch)
endif
endif

TRANSLATIONS = de sv

.PHONY: all build buildall clean install rpm run deploy-emu
all: compile


reformat:
	clang-format -i --style=file src/*xx

installdeps:
	sf

build: reformat lrelease
	$(sfdk) -c "target=$(target)" build


compile: reformat lrelease
	$(sfdk) -c "target=$(target)" build-shell make -C $(build_dir) -j4

.PHONY: make
make: compile




install:
	$(sfdk) -c "target=$(target)" make-install






rpm: lrelease



	touch rpm/*.yaml
	$(sfdk) -c "target=$(target)" package

.PHONY: deploy-emu
deploy-emu:
	$(sfdk) -c "device=$(emulator)" deploy --rsync









|


>



<
<
|



>






>
>
>



>
>
>
>
>
|
>
>
>








31
32
33
34
35
36
37
38
39
40
41
42
43
44


45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77

else
  build_dir := rpmbuilddir-$(arch)
endif
endif

TRANSLATIONS = de sv

.PHONY: all
all: compile

.PHONY: reformat
reformat:
	clang-format -i --style=file src/*xx



.PHONY: build
build: reformat lrelease
	$(sfdk) -c "target=$(target)" build

.PHONY: compile
compile: reformat lrelease
	$(sfdk) -c "target=$(target)" build-shell make -C $(build_dir) -j4

.PHONY: make
make: compile

$(build_dir)/$(program): make

.PHONY: install
install:
	$(sfdk) -c "target=$(target)" make-install

rpm_version := $(shell cat rpm/$(program).yaml | awk '/^Version:/ {print $$2}')
rpm_release := $(shell cat rpm/$(program).yaml | awk '/^Release:/ {print $$2}' | awk -F% '{print $$1}')
rpm_file := RPMS/$(program)-$(rpm_version)-$(rpm_release).$(arch).rpm

.PHONY: rpm
rpm:
	$(MAKE) lrelease $(rpm_file)

$(rpm_file): $(build_dir)/$(program) rpm/$(program).yaml rpm/$(program).changes
	touch rpm/*.yaml
	$(sfdk) -c "target=$(target)" package

.PHONY: deploy-emu
deploy-emu:
	$(sfdk) -c "device=$(emulator)" deploy --rsync
︙︙