Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Don't include sunwait #2693

Merged
merged 4 commits into from
May 24, 2023
Merged

Don't include sunwait #2693

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
763cc94
Delete sunwait.patch
EricClaeys May 24, 2023
06736b1
Update Makefile: delete references to sunwait
EricClaeys May 24, 2023
3670196
Remove sunwait-src folder
Alex-developer May 24, 2023
6dc66ce
Update changeLog.html: sunwait gone
EricClaeys May 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +0,0 @@
[submodule "src/sunwait-src"]
path = src/sunwait-src
url = https://github.com/risacher/sunwait
2 changes: 2 additions & 0 deletions html/documentation/changeLog.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ <h4>Bug Fixes</h4>
<span class="fileName">image-YYYYMMDDHHMMSS.jpg</span>.
<li>The <code>scp</code> upload protocol now uses the
<span class="shSetting">REMOTE_USER</span> setting.
<li>The <code>sunwait</code> command is no longer included with Allsky.
It was created but never used so was simply taking disk space.
</ul>

<hr class="separator"><!-- =========================================== -->
Expand Down
20 changes: 2 additions & 18 deletions src/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ endif

CFLAGS += $(DEFS) $(ZWOSDK)

all:check_deps capture_ZWO capture_RPi startrails keogram sunwait
all:check_deps capture_ZWO capture_RPi startrails keogram
.PHONY : all

ifneq ($(shell id -u), 0)
Expand All @@ -104,20 +104,6 @@ ifeq (,$(OPENCV))
endif
.PHONY : check_deps

patchsunwait:
@echo `date +%F\ %R:%S` Initializing sunwait submodule...
@git submodule init
@git submodule update
@echo `date +%F\ %R:%s` Patching sunwait compile warnings...
@patch -p1 -d sunwait-src/ < sunwait.patch
@touch patchsunwait

sunwait: patchsunwait
@echo `date +%F\ %R:%S` Building sunwait...
@$(MAKE) -C sunwait-src
@cp sunwait-src/sunwait .
@echo `date +%F\ %R:%S` Done.

allsky_common.o: allsky_common.cpp include/allsky_common.h
@echo Building $@ ...
@$(CC) -c allsky_common.cpp -o $@ $(CFLAGS) $(OPENCV)
Expand Down Expand Up @@ -183,7 +169,6 @@ install:
install -o $(SUDO_USER) -g $(SUDO_USER) keogram ../bin/; \
install -o $(SUDO_USER) -g $(SUDO_USER) startrails ../bin/; \
fi
@install sunwait $(DESTDIR)$(bindir)

uninstall:
@echo `date +%F\ %R:%S` Removing binaries...
Expand All @@ -192,7 +177,6 @@ uninstall:
rm -f $(DESTDIR)$(bindir)/capture_RPi; \
rm -f $(DESTDIR)$(bindir)/keogram; \
rm -f $(DESTDIR)$(bindir)/startrails; \
rm -f $(DESTDIR)$(bindir)/sunwait; \
else \
rm -f ../bin/capture_ZWO; \
rm -f ../bin/capture_RPi; \
Expand All @@ -204,7 +188,7 @@ endif # sudo / root check
.PHONY : install uninstall

clean:
rm -f capture_ZWO capture_RPi startrails keogram sunwait *.o *.a
rm -f capture_ZWO capture_RPi startrails keogram *.o *.a
.PHONY : clean

endif # Correct directory structure check
Expand Down
1 change: 0 additions & 1 deletion src/sunwait-src
Open in desktop
Submodule sunwait-src deleted from 102cb4
34 changes: 0 additions & 34 deletions src/sunwait.patch
View file
Open in desktop

This file was deleted.