Makefile and Build Fixups

.drone.yml

@@ -70,34 +70,15 @@ steps:
      - echo $BUILDFILES_KEY > ~/id_rsab64
      - base64 -d ~/id_rsab64 > ~/id_rsa
      - chmod 400 ~/id_rsa
-     - export DIR=libCwtch-autobindings-`cat VERSION`-`cat COMMIT_DATE`
+     - export DIR=libCwtch-autobindings-`cat COMMIT_DATE`-`cat VERSION`
      - mkdir -p $DIR
-     - mv windows android linux  $DIR/
+     - mv build/* $DIR/
      - cd $DIR
-     - find . -type f -exec sha256sum {} \; > ./../sha256s.txt
-     - mv ./../sha256s.txt .
+     - find . -type f -exec sha512sum {} \; > ./../sha512sum.txt
+     - mv ./../sha512sum.txt .
      - cd ..
      - scp -r -o StrictHostKeyChecking=no -i ~/id_rsa $DIR buildfiles@build.openprivacy.ca:/home/buildfiles/buildfiles/
 
-  - name: gitea-release
-    image: plugins/gitea-release
-    pull: if-not-exists
-    when:
-      event: tag
-    settings:
-      api_key:
-        from_secret: gogs_account_token
-      base_url: https://git.openprivacy.ca
-      files:
-        - libCwtch.so
-        - libCwtch.dll
-        - cwtch.aar
-        - cwtch-sources.jar
-        - libCwtch.h
-      checksum:
-        - sha256
-        - sha512
-
   - name: notify-gogs
     image: openpriv/drone-gogs
     pull: if-not-exists
@@ -166,12 +147,12 @@ steps:
       - echo $BUILDFILES_KEY > ~/id_rsab64
       - base64 -d ~/id_rsab64 > ~/id_rsa
       - chmod 400 ~/id_rsa
-      - export DIR=libCwtch-autobindings-`cat VERSION`-`cat COMMIT_DATE`
+      - export DIR=libCwtch-autobindings-`cat COMMIT_DATE`-`cat VERSION`
       - mkdir -p $DIR
-      - mv macos  $DIR/
+      - mv build/* $DIR/
       - cd $DIR
-      - find . -type f -exec shasum -a 512 {} \; > ./../sha512s.txt
-      - mv ./../sha512s.txt .
+      - find . -type f -exec shasum -a 512 {} \; > ./../macsha512s.txt
+      - mv ./../macsha512s.txt .
       - cd ..
       - scp -r -o StrictHostKeyChecking=no -i ~/id_rsa $DIR buildfiles@build.openprivacy.ca:/home/buildfiles/buildfiles/
 

Makefile

@@ -53,7 +53,7 @@ libCwtch.dll: lib.go
 	mv libCwtch.h build/windows/
 
 clean: 
-	rm -f cwtch.aar cwtch_go.apk libCwtch.h libCwtch.so cwtch-sources.jar libCwtch.dll libCwtch.dylib build
+	rm -fr cwtch.aar cwtch_go.apk libCwtch.h libCwtch.so cwtch-sources.jar libCwtch.dll libCwtch.*.dylib build
 
 # iOS - for testing purposes only for now, not officially supported