Skip to content

Commit a4a2baf

Browse files
committed
move some template files to auto places
- moved ultragrid-bugreport-collect.sh to doc (will be bundled automatically) - moved data/MacOS-bundle-template to data/template (just a move) - added data/template/README.md
1 parent 3dc789c commit a4a2baf

File tree

9 files changed

+9
-5
lines changed

9 files changed

+9
-5
lines changed

.github/scripts/macOS/install_others.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ install_live555() {(
9898
)}
9999

100100
install_soundfont() {(
101-
sf_dir="$srcroot/data/MacOS-bundle-template/Contents/share/soundfonts"
101+
sf_dir="$srcroot/data/template/macOS-bundle/Contents/share/soundfonts"
102102
mkdir -p "$sf_dir"
103103
cp "$GITHUB_WORKSPACE/data/default.sf3" "$sf_dir"
104104
)}

Makefile.in

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -577,7 +577,7 @@ $(BUNDLE): $(TARGET) $(REFLECTOR_TARGET) @MANPAGES@ hd-rum-multi/hd-rum
577577
rm -rf $(BUNDLE)
578578
$(MKDIR_P) $(BUNDLE)/Contents/MacOS $(BUNDLE)/Contents/libs $(BUNDLE)/Contents/Frameworks
579579
$(CP) $(REFLECTOR_TARGET) $(TARGET) $(BUNDLE)/Contents/MacOS/
580-
$(CP) -r data/MacOS-bundle-template/* $(BUNDLE)/
580+
$(CP) -r data/template/macOS-bundle/* $(BUNDLE)/
581581
$(CP) hd-rum-multi/hd-rum $(BUNDLE)/Contents/MacOS/
582582
$(CP) $(srcdir)/data/template/bin/* $(BUNDLE)/Contents/MacOS
583583
$(CP) -r $(srcdir)/share/ $(BUNDLE)/Contents/share/
@@ -664,9 +664,8 @@ install: all
664664
$(INSTALL) -m 755 @MODULES@ $(DESTDIR)$(libdir)/ultragrid;\
665665
fi
666666
$(INSTALL) -d -m 755 $(DESTDIR)$(docdir)
667-
$(INSTALL) -m 644 $(DOCS) $(DESTDIR)$(docdir)
667+
$(CP) $(DOCS) $(DESTDIR)$(docdir)
668668
$(INSTALL) -m 644 $(srcdir)/CONTRIBUTING.md $(srcdir)/COPYRIGHT $(srcdir)/INSTALL $(srcdir)/NEWS $(srcdir)/README.md $(DESTDIR)$(docdir)
669-
$(INSTALL) -m 755 $(srcdir)/data/ultragrid-bugreport-collect.sh $(DESTDIR)$(docdir)
670669
$(INSTALL) -d -m 755 $(DESTDIR)$(man1dir)
671670
if [ -n '@MANPAGES@' ]; then $(INSTALL) -m 644 @MANPAGES@ $(DESTDIR)$(man1dir); fi
672671
if [ -n '@DLL_LIBS@' ]; then $(INSTALL) -m 644 @DLL_LIBS@ $(DESTDIR)$(bindir); fi
@@ -680,7 +679,6 @@ uninstall:
680679
if [ -n "@MODULES@" ]; then for n in @MODULES@; do $(RM) $(DESTDIR)$(libdir)/ultragrid/`basename $$n`; done; fi
681680
for n in $(DOCS); do $(RM) $(DESTDIR)$(docdir)/`basename $$n`; done;
682681
$(RM) $(DESTDIR)$(docdir)/CONTRIBUTING.md $(DESTDIR)$(docdir)/COPYRIGHT $(DESTDIR)$(docdir)/INSTALL $(DESTDIR)$(docdir)/NEWS $(DESTDIR)$(docdir)/README.md
683-
$(RM) $(DESTDIR)$(docdir)/ultragrid-bugreport-collect.sh
684682
rmdir $(DESTDIR)$(docdir)
685683
$(RM) $(DESTDIR)$(man1dir)/uv.1 $(DESTDIR)$(man1dir)/hd-rum-transcode.1
686684
if [ -f "$(GUI_TARGET)" ]; then \

data/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
- screen-capture-recorder-x64.dll is taken from https://sourceforge.net/projects/screencapturer/
22
- default.sf3 - https://musical-artifacts.com/artifacts/2642, but compressed
33
with <https://github.com/musescore/sftools>
4+
- template - various distribution templates (see template/README.md)

data/template/README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
files from this subdirectories will be deployed automatically:
2+
3+
1. macOS/* - will be copied to macOS bundle
4+
2. bin/* - will be copied to $(bindir) and also to macOS bundle
5+
Contents/MacOS subdir

0 commit comments

Comments
 (0)